Bug 1023664 - Calendar modularization 2

exporting a constructor! lets do the `return` instead.