A bit of cleanup for mapData and things it touches.