Replaced SimpleTraverser references in MatchStep with more general Traverser.makeSibling(). Misc. tweaks
Resolved merge conflict