I understand what you are saying. I can pull this out for now, if you like, in order to have a more consistent approach to the codebase, but perhaps we can revisit this in a future release.