Move DataTreeCandidate extraction to where it is applied