Improve ConTeXt transformations