What do you think of #518 instead of changing the resolver?  I am not a parser expert, but I think this is closer to the way hive (and probably optiq which we hope to use eventually) work.