This entire file was whitespace fixes that weren't caught in review of this patch.