Whitespace updates to fix the last of the indentation conflicts.