Complete markup upgrades for map-bind.