r2078: Changes to finish separating clsql-base form clsql