MapWithKey uses key AND value

this corrects 9c5c31824a710c4afa where I said it would only use the keys