Convenience fix:  make these necessary classes into singletons.

At a minimum, these and a few more are ripe for the conversion.
This PR alone will be fine for now.