Various changes to reduce duplication and extend the mtu through the map.