Housekeeping: All *::CLAZZ references removed.