Normalize some fields during parsing