removing constants from EnumValue fixes #1