No, I think you are right about using the helper directly. Sorry I read the commit first, then the Issue.