replacing more expressions from BaseLanguage with mbeddr expressions