Clean up defer_parser in the builder