Calendar rebase (4) 

This replaces #1352.
Yes, the case of a user setting a single option with an invalid value resulting in a single refresh is much less of a concern than many options being set to valid values and being refreshed five times.