Whitespace cleanup, various other changes.