improved semantics for apply_remap