I think, for now, that is the cleanest solution. I'll change the pull-request.