Using expand constant exprs first. Now starting to rebuild the local var
insertion logic, etc.
Hard work results brings