Whitespace changes for compliance with 4-space tabbing