Rollup of cleanup commits from other MRs
Collect changes from !1921 (closed) !1922 (closed) !1923 (closed) !1924 (closed) !1926 (closed) !1927 (closed) !1928 (closed) in a single branch. Many of them were originally proposed in !1908 (closed).
Edited by Brad King