Small cleanups in HashMap based off of new rust features.