Some more whitespace cleanups.