That is what's going, I believe, but I think we should introduce this change in a later refactoring, assuming this is still valid in the Java backend. I suspect this change might require some subtle changes in lots of different places (including possibly in the parser). Plus, it makes it much easier to merge with master if we only do the minimum necessary to get it compatible at this point. Refactoring can come later.