Code cleanup for map-cross.