Make more use of the abstract node implementations