Remove HTML from JavaDoc test grammar.
Only apply "deepest" matches in selector.

We should do additional conflict resolution and the "TODO: revamp to make way
more efficient" comment still stands, but this gets us into pretty workable
land for the moment.