Simplify variable escaping in CatalogueCompiler