this would work for the queries, if only we could change t/fun like that. can we, @TiarkRompf ?