refactor detection of class CategoryYearMonthDay in a less nonsense way (part 2)

Note that nothing extends the class 'CategoryYearMonthDay',
so, I'm quite sure nothing will explode after this change.