Use inline dependency injection on CalendarCtrl, fixes #16