- Only first-pass reoptimize what is necessary in target tree
- Shouldn't commit this... reoptimization optimization for target tree, might as well revert it
- fix