Changed NodeClassifier so that modifiers, simpletypes and typers are no
longer considered leafnodes as they gave very poor matching.