Preserve order of map() calls for actually performing the mapping
TODO this breaks some tests, investigate