While changing this code, simplify tracking code to allow returning the base address node, this way callers don't have to manually rebuild it on each invocation.