Merge in cleanup on the parser API.