Don't include dicts in query_scalar
Allow "make" to be a list of arguments