Start refactoring Expression passing