Whitespace improvments.