I agree, and updated the PR #7223 accordingly.