Bug 1023664 - Calendar modularization 2

use `return` for constructors!