Fix taking addr() of map value/key

Closes #2901