Calendar: Improve type declaration using generic types with default parameters

Calendar: Improve type declaration using generic types with default parameters #4398