Whitespace indentation compatibility

Always on for now.
Merged