data-tree-reordering tweaks