if we go through query().from_statement(), this should be enough (and more than we had before).