Move queries with variable number of args to a fixed number of args syntax

Move queries with variable number of args to a fixed number of args syntax #58