Added generic parameters to node and tree selectors. This is because they are constructed with NodeMatchers which have parameters