Assorted trivial cleanups 3/2019 (#2030)