Convert TNode / TElement to use self parameters rather than &self