Minor cleanups

These were some minor things that were lost or overlooked in #540. None of them affect correctness.