Restructure integer, even number and odd number as a NumericTypeMatcher
Delete add_types from DisallowValueMatcher