Not going to fix this in this pull request; out of scope.