more conservative classoid-name clearing