r8837: further usql integration