Switch more classinfos to typeid