Assorted trivial cleanups 5/2019