Clean out dead code
Push kid into subtrees, not original OP

Also includes a bit more debug output.
Attempt to do parent OP fixups