Special case the arguments for a few queries.

These all need a fixed number of arguments with one optional extra
argument for keyword arguments:

between
distance
during
insert
Three more expected results in tests need a list wrap.