Improve idate() return types

Improve idate() return types #22619