Resolved conflict.
Made interfaces of generalized queries.
Modified IncSalary to conform to interfacing trafos.
Generalized queries in freevars.
Desugar and rename now use new framework.
Depgraph example new style.