Assorted trivial cleanups June 2019