Split off tracking of node presence

No match.