some trivial whitespace patches uncommitted from old svn checkout