Misc. clean-up, tweaks, and adjustments after using Groundwork in the wild

A variety of miscelaneous low-level tweaks and adjustments after using
Groundwork in the wild.