Bug 1023664 - Calendar modularization 2

let's use `return` for all constructors!