Clean up record parsers