minor fixes in the dsl's generator for UNTIL