Avoid obligation construction dance with query region constraints And some renaming...
CanonicalVarInfo