Miscellaneous Cleanup

These are just things that I've run across, that needed to be fixed. The vast majority of them are a byproduct of #1926, but that didn't belong there.