Remove commented-out regression test
Correct mergeIndex comment
Add to Query mutator. Fix subquery expression stuff.