I personally think the consistency would be better here.
Especially if we move down the road of linking up qwery and bonzo in a module specific to the Guardian. So in essence use one solution to one problem.

Either way, this is the fastest.