Cleans up some of the calendar control types and for the time being makes them simple controls which can be used within the form designer (though some may lose their 'simple' status before stable release) [#885]