Patch against HEAD to remove enum identifiers