Convert x.classinfo to typeid(x)
Merge pull request #1700 from yebblies/classinfo_typeid

Convert x.classinfo to typeid(x)
Fix cases where goto skips initialization of variables
Merge pull request #1703 from yebblies/gotoskipinit

Fix cases where goto skips initialization of variables