Merge "Fix a couple crashes in the new reorderer"