Now with better contraction!
Translation from GV terms into CP terms mostly seems to work.  However,
it's still broken for variable shadowing.