Update schedules to simplify retrieval of next occurrence.

- Also add some missing (undocumented) categories.