Those were spread out over the implementation here, and they exist as public API in calendarsupport. Make those public API here instead.