Agree, that would be better. Have submitted PR #9598.