Julian>I have added some commits in https://github.com/apache/calcite/pull/2278 < https://github.com/apache/calcite/pull/2278> that fix the three points I raised.
Thanks. Are you done with it? Please let me know if you have more commits coming. I had very similar refactorings in mind and the reason I skipped them as I wanted to avoid mixing all the fixes into a single PR. For instance, I know there were "field can be final" issues, and it was very tempting to fix all of them :) Vladimir
