Upgrade shipped maps to the latest format.
Fix an unrelated editor regression.