Most of these changes just hush compiler warnings, but some also assert formerly implicit assumptions.