ck_rwlock: Additional reorganization.