Remove use of explicit interface impl. in Queries