Remove coupling to Factory::getLanguage() (Ref #32)