Recurse to simplify flow of covariance_pass_two(). Move tests for V2 into for loop.