Fixed highlighting of "with"-definitions