map-types refactored, iorg--unwind-circular-lists improved.