Minor revision of map2d procedures.