zink: query refactor
some refactoring to improve (future) code reuse, reduce compute batch overhead, and reduce special-casing
Edited by Mike Blumenkrantz
some refactoring to improve (future) code reuse, reduce compute batch overhead, and reduce special-casing