Working on the generation of the uni statement, making it more robust where variables are guarded by constants