Issue #2285349 follow-up by effulgentsia: Cleanup to function name and code comments.