This is an easy one; we have Query as an interface and DefaultQuery as the only implementation. Like the only implementation ever ...
We should recast Query using the DefaultQuery implementation. The DefaultQuery subclass can remain for backwards compatibility.
With this change Query can be used directly: