Refactoring just a little the new JdbcSqlQuery API.