PH: Style enhancements from Michael...and then a few more to be
consistent.