Simplify node matching