This re-introduces several cleanups that we previously deferred for not supporting Rust 1.25.
EntityMap
SecondaryMap