I think these could be addressed using methods like [`mangle`](http://static.rust-lang.org/doc/master/collections/hashmap/struct.HashMap.html#method.mangle)... but no need to do the changes in this PR (if you do do them, a separate commit would be good).