Non static match condition

Review PR
Isn't the check for node type redundant, if nodeSelectorMatches() does it.