WIP
reverse repeated map changes, see if hanifi's patch apple cleanly.
Still has execution problems, disabling generic rewrite rule to split complex expressions.
Manually re-applied Hanifi's changes for repeated map.
re-apply changes to repeated map to allow creating a transfer pair to a simple map.