Well the hope is to get both this and HHH-16 into 5.1. So I need to work with interplay. For example, if I leave this as it is then my problem in HHH-16 becomes less of a problem in (at least) the 80% case since I'd be able to "link up" the entity-join with its left-hand-side based on the resolved aliases/references. But this issue ask to remove that. Both are valid, but you can see how they affect one another. Today I plan on looking at modeling the notion of a space in the AST and see how much work that is in the current parser. From there I will have a better idea.