Is that actually necessary for adding `P`? Because this split seems to have added a lot of additional possibly-unnecessary changes to an already huge patch (and introduced at least one typo-bug).

However, at this point, I'd guess undoing it and reverting back to a single `NodeTraitMethod` would just introduce more bugs...