Bug 1023664 - Calendar modularization 2

`return` ALL the constructors!!!