Support for deep filtering of indirect nonterminals added.