Unding aggressive whitespace cleanup in patch