Fix free lifetime vars in HashMap's iterators

Fixes #17500 
Should just put trailing commas on all these so we don't get these dumb diffs again.