Begin work on getting projections into enumerator
Fix imports after calcite 1 upgrade