Fix name resolution in if_none expressions