Improve rewrap by wrapping at the root of target subtree