CppParser fixes to support function try blocks and unions