ls-tree: further tweaks of the rewrite