Remove wrong dependencies on the recursive __call__.