Continue removing use of boost::unordered_map