Simplify split remapping