Mop up some lagging whitespace cleanups ..