Allow Enums as terms.
Remove 2 @Ignore