I agree with this. I will make this change in a PR after this one gets merged.