Fix name resolution in if_none expressions
Merge branch 'master' into desugar