More removal of duplicated code in the Map classes.