correlated_fields.py: Resolve FIXMEs
Drop one and rename the other two.
Drop one and rename the other two.
mentioned in commit 77c8e164
·mentioned in commit 77c8e164
mentioned in commit ddb0b92d
·mentioned in commit ddb0b92d
mentioned in commit b2266328
·mentioned in commit b2266328
mentioned in commit cc3f6891
·mentioned in commit cc3f6891
mentioned in commit ddfde472
·mentioned in commit ddfde472