Clean up FromSql API