PR #5712 predates several refactorings to move the utility code into a more general purpose codebase. Update to reflect the refactorings.
