Random minor fixes and cleanups from another branch
In order to shrink a work-in-progress branch I have, I extracted these, which seemed isolated enough.
In order to shrink a work-in-progress branch I have, I extracted these, which seemed isolated enough.