[C++ PATCH] cp_expr tweak and delete unused enumerations