You may be right. Maybe something for a new PR later?