Change parameter order of split-* to match core split-*, fix split-at