Merge some whitespace changes from the DFS branch