Fix taking addr() of map value/key
Merge pull request #2916 from lavalamp/fix3

Fix taking addr() of map value/key