Clean up some of the MULTIPLE_OWNERS macros.  Misc clean-up.