Add a helper function for newMap to simplify reading of some code

Also enables tuning in the future in a single location