properly default diffTool
drop xpath shim
shorten simple-node in view of removal asap
clean up comments