Everything is working again after the expression type refactoring.  Now it is a lot easier to reason and work with.