Handle local vars in composite head better

Previously the rewriting step was not walking the comprehension head. As
a result, vars embedded inside composites were not rewritten. This
change updates the rewriting to use a visitor to resolve the issue.