Whitespace/wrapping cleanups.