(RGL) More cleanups, pt. 9 (and some opts.)