Simplify the re-ordering / merging, because we can't get the other way to work :(