Refactoring expressions.  Now the expression hiearchy is fully tracked and typed even when expressions are transparent.