Other changes: * Refactor Database.query() to accept a list of clauses, rather than a dict of key-value pairs to build '{k} = :{k}' clauses from