Switch to use non-recursive maps.