Created by: camdencheek
Just a cleanup pass of the things that don't fit in other PRs. Details inline.
Semantics-preserving and minimal changes.