More reworking of the recursive feature.