ChangeLogTag: Mon Jun 28 06:59:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

116 files changed, 868 insertions, 891 deletions

diff --git a/TAO/tao/AnySeqA.cpp b/TAO/tao/AnySeqA.cpp
index 59bb0eafd60..55b9e326af5 100644
--- a/TAO/tao/AnySeqA.cpp
+++ b/TAO/tao/AnySeqA.cpp
@@ -35,12 +35,12 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_CORBA_AnySeq_GUARD
@@ -64,6 +64,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_CORBA_AnySeq_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -82,7 +83,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
diff --git a/TAO/tao/AnySeqC.cpp b/TAO/tao/AnySeqC.cpp
index 7dfce1e6ca3..f04c69e6e47 100644
--- a/TAO/tao/AnySeqC.cpp
+++ b/TAO/tao/AnySeqC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/AnySeqC.h b/TAO/tao/AnySeqC.h
index 47c5165c278..18803cc7ac3 100644
--- a/TAO/tao/AnySeqC.h
+++ b/TAO/tao/AnySeqC.h
@@ -45,6 +45,7 @@
 #include "tao/Environment.h"
 #include "tao/TypeCode_Constants.h"
 #include "tao/Any.h"
+#include "tao/TypeCode.h"
 #include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
diff --git a/TAO/tao/BooleanSeqA.cpp b/TAO/tao/BooleanSeqA.cpp
index b7f1ec4ce00..8cef36af73b 100644
--- a/TAO/tao/BooleanSeqA.cpp
+++ b/TAO/tao/BooleanSeqA.cpp
@@ -35,12 +35,12 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_CORBA_BooleanSeq_GUARD
@@ -64,6 +64,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_CORBA_BooleanSeq_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -82,7 +83,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
diff --git a/TAO/tao/BooleanSeqC.cpp b/TAO/tao/BooleanSeqC.cpp
index a1af732ef20..60a12b01952 100644
--- a/TAO/tao/BooleanSeqC.cpp
+++ b/TAO/tao/BooleanSeqC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/BoundsA.cpp b/TAO/tao/BoundsA.cpp
index 6dbe977a16d..ba6d1c0711d 100644
--- a/TAO/tao/BoundsA.cpp
+++ b/TAO/tao/BoundsA.cpp
@@ -36,14 +36,13 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
+// be\be_visitor_typecode/struct_typecode.cpp:87
 
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_CORBA_Bounds = 0;
 static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_Bounds (
     CORBA::tk_except,
     "IDL:omg.org/CORBA/Bounds:1.0",
@@ -60,7 +59,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
+// be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
 {
diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp
index 9c6636f790b..afc9e083f0d 100644
--- a/TAO/tao/BoundsC.cpp
+++ b/TAO/tao/BoundsC.cpp
@@ -39,7 +39,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/BoundsC.h b/TAO/tao/BoundsC.h
index a2b773b10cd..25799fb8fa0 100644
--- a/TAO/tao/BoundsC.h
+++ b/TAO/tao/BoundsC.h
@@ -65,7 +65,7 @@ namespace CORBA
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:51
+  // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_CORBA_BOUNDS_CH_)
 #define _CORBA_BOUNDS_CH_
@@ -102,7 +102,7 @@ namespace CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:127
+    // be\be_visitor_exception/exception_ch.cpp:129
     
     virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
diff --git a/TAO/tao/CONV_FRAMEA.cpp b/TAO/tao/CONV_FRAMEA.cpp
index 2c7e626c2f7..48998fffc69 100644
--- a/TAO/tao/CONV_FRAMEA.cpp
+++ b/TAO/tao/CONV_FRAMEA.cpp
@@ -32,12 +32,13 @@
 #include "tao/Sequence_TypeCode_Static.h"
 #include "tao/Struct_TypeCode_Static.h"
 #include "tao/TypeCode_Struct_Field.h"
+#include "tao/Recursive_Type_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -57,12 +58,12 @@ namespace CONV_FRAME
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_CONV_FRAME_CodeSetIdSeq_GUARD
@@ -86,6 +87,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_CONV_FRAME_CodeSetIdSeq_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -104,7 +106,12 @@ namespace CONV_FRAME
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CONV_FRAME_CodeSetComponent[] =
   {
@@ -113,10 +120,9 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
   _tao_tc_CONV_FRAME_CodeSetComponent (
     CORBA::tk_struct,
     "IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0",
@@ -133,7 +139,7 @@ namespace CONV_FRAME
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
+// be\be_visitor_typecode/struct_typecode.cpp:87
 
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CONV_FRAME_CodeSetComponentInfo[] =
   {
@@ -142,10 +148,9 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
   _tao_tc_CONV_FRAME_CodeSetComponentInfo (
     CORBA::tk_struct,
     "IDL:omg.org/CONV_FRAME/CodeSetComponentInfo:1.0",
@@ -162,7 +167,7 @@ namespace CONV_FRAME
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
+// be\be_visitor_typecode/struct_typecode.cpp:87
 
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CONV_FRAME_CodeSetContext[] =
   {
@@ -171,10 +176,9 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
   _tao_tc_CONV_FRAME_CodeSetContext (
     CORBA::tk_struct,
     "IDL:omg.org/CONV_FRAME/CodeSetContext:1.0",
@@ -191,7 +195,7 @@ namespace CONV_FRAME
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
@@ -250,7 +254,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -308,7 +312,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -366,7 +370,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp
index 671886cf99a..883637c6b40 100644
--- a/TAO/tao/CONV_FRAMEC.cpp
+++ b/TAO/tao/CONV_FRAMEC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/CharSeqA.cpp b/TAO/tao/CharSeqA.cpp
index 406d7ac50f1..734fda6bb86 100644
--- a/TAO/tao/CharSeqA.cpp
+++ b/TAO/tao/CharSeqA.cpp
@@ -35,12 +35,12 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_CORBA_CharSeq_GUARD
@@ -64,6 +64,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_CORBA_CharSeq_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -82,7 +83,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
diff --git a/TAO/tao/CharSeqC.cpp b/TAO/tao/CharSeqC.cpp
index 6a7a8b69980..8936ce6b25d 100644
--- a/TAO/tao/CharSeqC.cpp
+++ b/TAO/tao/CharSeqC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/ClientRequestInfoA.cpp b/TAO/tao/ClientRequestInfoA.cpp
index 07ed87cd3b7..75245ee97ed 100644
--- a/TAO/tao/ClientRequestInfoA.cpp
+++ b/TAO/tao/ClientRequestInfoA.cpp
@@ -36,7 +36,7 @@
 #include "tao/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
+// be\be_visitor_typecode/objref_typecode.cpp:76
 
 static TAO::TypeCode::Objref<char const *,
                              TAO::Null_RefCount_Policy>
@@ -54,7 +54,7 @@ namespace PortableInterceptor
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// be\be_visitor_interface/any_op_cs.cpp:50
 
 namespace TAO
 {
diff --git a/TAO/tao/ClientRequestInfoC.cpp b/TAO/tao/ClientRequestInfoC.cpp
index 1d0f6a5f6ee..b818e7383c8 100644
--- a/TAO/tao/ClientRequestInfoC.cpp
+++ b/TAO/tao/ClientRequestInfoC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:291
+// be\be_codegen.cpp:291
 
 
 #include "ClientRequestInfoC.h"
@@ -38,7 +38,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
@@ -47,7 +47,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::ClientRequestInfo.
 
@@ -102,15 +102,9 @@ PortableInterceptor::ClientRequestInfo::_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ClientRequestInfo::_nil ();
-    }
-  
-  ClientRequestInfo_ptr proxy =
-    dynamic_cast<ClientRequestInfo_ptr> (_tao_objref);
-  
-  return ClientRequestInfo::_duplicate (proxy);
+  return ClientRequestInfo::_duplicate (
+      dynamic_cast<ClientRequestInfo_ptr> (_tao_objref)
+    );
 }
 
 PortableInterceptor::ClientRequestInfo_ptr
@@ -119,15 +113,9 @@ PortableInterceptor::ClientRequestInfo::_unchecked_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ClientRequestInfo::_nil ();
-    }
-  
-  ClientRequestInfo_ptr proxy =
-    dynamic_cast<ClientRequestInfo_ptr> (_tao_objref);
-  
-  return ClientRequestInfo::_duplicate (proxy);
+  return ClientRequestInfo::_duplicate (
+      dynamic_cast<ClientRequestInfo_ptr> (_tao_objref)
+    );
 }
 
 PortableInterceptor::ClientRequestInfo_ptr
diff --git a/TAO/tao/ClientRequestInfoC.h b/TAO/tao/ClientRequestInfoC.h
index 431fe9b1b3c..a5bfb614689 100644
--- a/TAO/tao/ClientRequestInfoC.h
+++ b/TAO/tao/ClientRequestInfoC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_CLIENTREQUESTINFOC_H_
 #define _TAO_IDL_ORIG_CLIENTREQUESTINFOC_H_
@@ -47,6 +47,7 @@
 #include "tao/Object.h"
 #include "tao/TypeCode_Constants.h"
 #include "tao/Any.h"
+#include "tao/TypeCode.h"
 #include "tao/Objref_VarOut_T.h"
 
 #include "tao/RequestInfoC.h"
@@ -68,13 +69,13 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace PortableInterceptor
 {
   
   // TAO_IDL - Generated from
-  // .\be\be_interface.cpp:598
+  // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_
@@ -97,7 +98,7 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_
@@ -132,7 +133,7 @@ namespace PortableInterceptor
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Object_ptr target (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -142,7 +143,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Object_ptr effective_target (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -152,7 +153,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::IOP::TaggedProfile * effective_profile (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -162,7 +163,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Any * received_exception (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -172,7 +173,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual char * received_exception_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -182,7 +183,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::IOP::TaggedComponent * get_effective_component (
         ::IOP::ComponentId id
@@ -193,7 +194,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::IOP::TaggedComponentSeq * get_effective_components (
         ::IOP::ComponentId id
@@ -204,7 +205,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::CORBA::Policy_ptr get_request_policy (
         ::CORBA::PolicyType type
@@ -215,7 +216,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void add_request_service_context (
         const ::IOP::ServiceContext & service_context,
@@ -227,7 +228,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
+    // be\be_visitor_interface/interface_ch.cpp:210
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -253,17 +254,17 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ClientRequestInfo;
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module PortableInterceptor
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:61
+// be\be_visitor_traits.cpp:61
 
 // Traits specializations.
 namespace TAO
@@ -292,14 +293,14 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInfo_ptr); // copying
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInfo_ptr *); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ClientRequestInfo_ptr &);
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:955
+// be\be_codegen.cpp:955
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/TAO/tao/ClientRequestInterceptorC.cpp b/TAO/tao/ClientRequestInterceptorC.cpp
index aa609bfd57f..8e2bf9e81f6 100644
--- a/TAO/tao/ClientRequestInterceptorC.cpp
+++ b/TAO/tao/ClientRequestInterceptorC.cpp
@@ -38,7 +38,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
@@ -102,15 +102,9 @@ PortableInterceptor::ClientRequestInterceptor::_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ClientRequestInterceptor::_nil ();
-    }
-  
-  ClientRequestInterceptor_ptr proxy =
-    dynamic_cast<ClientRequestInterceptor_ptr> (_tao_objref);
-  
-  return ClientRequestInterceptor::_duplicate (proxy);
+  return ClientRequestInterceptor::_duplicate (
+      dynamic_cast<ClientRequestInterceptor_ptr> (_tao_objref)
+    );
 }
 
 PortableInterceptor::ClientRequestInterceptor_ptr
@@ -119,15 +113,9 @@ PortableInterceptor::ClientRequestInterceptor::_unchecked_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ClientRequestInterceptor::_nil ();
-    }
-  
-  ClientRequestInterceptor_ptr proxy =
-    dynamic_cast<ClientRequestInterceptor_ptr> (_tao_objref);
-  
-  return ClientRequestInterceptor::_duplicate (proxy);
+  return ClientRequestInterceptor::_duplicate (
+      dynamic_cast<ClientRequestInterceptor_ptr> (_tao_objref)
+    );
 }
 
 PortableInterceptor::ClientRequestInterceptor_ptr
diff --git a/TAO/tao/ClientRequestInterceptorC.h b/TAO/tao/ClientRequestInterceptorC.h
index 01f4a3e16ff..8b90e4d2280 100644
--- a/TAO/tao/ClientRequestInterceptorC.h
+++ b/TAO/tao/ClientRequestInterceptorC.h
@@ -69,22 +69,22 @@
 
 namespace PortableInterceptor
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_
-
+  
   class ClientRequestInfo;
   typedef ClientRequestInfo *ClientRequestInfo_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ClientRequestInfo
       >
     ClientRequestInfo_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ClientRequestInfo
@@ -92,22 +92,22 @@ namespace PortableInterceptor
     ClientRequestInfo_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_
-
+  
   class ClientRequestInterceptor;
   typedef ClientRequestInterceptor *ClientRequestInterceptor_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ClientRequestInterceptor
       >
     ClientRequestInterceptor_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ClientRequestInterceptor
@@ -115,45 +115,45 @@ namespace PortableInterceptor
     ClientRequestInterceptor_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_
-
+  
   class TAO_Export ClientRequestInterceptor
     : public virtual ::PortableInterceptor::Interceptor
   {
   public:
     typedef ClientRequestInterceptor_ptr _ptr_type;
     typedef ClientRequestInterceptor_var _var_type;
-
+    
     // The static operations.
     static ClientRequestInterceptor_ptr _duplicate (ClientRequestInterceptor_ptr obj);
-
+    
     static void _tao_release (ClientRequestInterceptor_ptr obj);
-
+    
     static ClientRequestInterceptor_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ClientRequestInterceptor_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ClientRequestInterceptor_ptr _nil (void)
     {
       return static_cast<ClientRequestInterceptor_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void send_request (
         ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -162,10 +162,10 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void send_poll (
         ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -173,10 +173,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void receive_reply (
         ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -184,10 +184,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void receive_exception (
         ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -196,7 +196,7 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
diff --git a/TAO/tao/CurrentA.cpp b/TAO/tao/CurrentA.cpp
index bbc4a381b32..1ae19a03c5c 100644
--- a/TAO/tao/CurrentA.cpp
+++ b/TAO/tao/CurrentA.cpp
@@ -35,7 +35,7 @@
 #include "tao/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
+// be\be_visitor_typecode/objref_typecode.cpp:76
 
 static TAO::TypeCode::Objref<char const *,
                              TAO::Null_RefCount_Policy>
@@ -53,7 +53,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// be\be_visitor_interface/any_op_cs.cpp:50
 
 namespace TAO
 {
diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp
index 3d614ee39a9..80539961bd3 100644
--- a/TAO/tao/CurrentC.cpp
+++ b/TAO/tao/CurrentC.cpp
@@ -38,7 +38,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
@@ -102,15 +102,9 @@ CORBA::Current::_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Current::_nil ();
-    }
-  
-  Current_ptr proxy =
-    dynamic_cast<Current_ptr> (_tao_objref);
-  
-  return Current::_duplicate (proxy);
+  return Current::_duplicate (
+      dynamic_cast<Current_ptr> (_tao_objref)
+    );
 }
 
 CORBA::Current_ptr
@@ -119,15 +113,9 @@ CORBA::Current::_unchecked_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Current::_nil ();
-    }
-  
-  Current_ptr proxy =
-    dynamic_cast<Current_ptr> (_tao_objref);
-  
-  return Current::_duplicate (proxy);
+  return Current::_duplicate (
+      dynamic_cast<Current_ptr> (_tao_objref)
+    );
 }
 
 CORBA::Current_ptr
diff --git a/TAO/tao/DomainA.cpp b/TAO/tao/DomainA.cpp
index 2b12440b086..56760c9c277 100644
--- a/TAO/tao/DomainA.cpp
+++ b/TAO/tao/DomainA.cpp
@@ -37,7 +37,7 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
+// be\be_visitor_typecode/objref_typecode.cpp:76
 
 static TAO::TypeCode::Objref<char const *,
                              TAO::Null_RefCount_Policy>
@@ -55,7 +55,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
+// be\be_visitor_typecode/objref_typecode.cpp:76
 
 static TAO::TypeCode::Objref<char const *,
                              TAO::Null_RefCount_Policy>
@@ -73,12 +73,12 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_CORBA_DomainManagerList_GUARD
@@ -102,6 +102,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_CORBA_DomainManagerList_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -120,7 +121,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// be\be_visitor_interface/any_op_cs.cpp:50
 
 namespace TAO
 {
@@ -178,7 +179,7 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// be\be_visitor_interface/any_op_cs.cpp:50
 
 namespace TAO
 {
@@ -236,7 +237,7 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index 01811b5e642..a87836007e5 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -52,7 +52,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // TAO specific stuff.
 namespace CORBA
@@ -102,7 +102,7 @@ namespace TAO
 
 #if !defined (_CORBA_POLICY__ARG_TRAITS_CS_)
 #define _CORBA_POLICY__ARG_TRAITS_CS_
-
+  
   template<>
   class  Arg_Traits<CORBA::Policy>
     : public
@@ -119,7 +119,7 @@ namespace TAO
 
 #if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_CS_)
 #define _CORBA_INTERFACEDEF__ARG_TRAITS_CS_
-
+  
   template<>
   class  Arg_Traits<CORBA::InterfaceDef>
     : public
@@ -173,7 +173,7 @@ TAO::Objref_Traits<CORBA::DomainManager>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -193,15 +193,15 @@ TAO::Collocation_Proxy_Broker *
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_DomainManager_Proxy_Broker_ == 0)
     {
       CORBA_DomainManager_setup_collocation ();
     }
-
-  TAO::Arg_Traits< CORBA::Policy>::ret_val _tao_retval;
+  
+  TAO::Arg_Traits< ::CORBA::Policy>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::PolicyType>::in_arg_val _tao_policy_type (policy_type);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -401,7 +401,7 @@ void CORBA::ConstructionPolicy::make_domain_manager (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val _tao_object_type (object_type);
+  TAO::Arg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_object_type (object_type);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_constr_policy (constr_policy);
   
   TAO::Argument *_the_tao_operation_signature [] =
diff --git a/TAO/tao/DoubleSeqA.cpp b/TAO/tao/DoubleSeqA.cpp
index 0d5da3dcd11..a8a2fa37ff6 100644
--- a/TAO/tao/DoubleSeqA.cpp
+++ b/TAO/tao/DoubleSeqA.cpp
@@ -35,12 +35,12 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_CORBA_DoubleSeq_GUARD
@@ -64,6 +64,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_CORBA_DoubleSeq_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -82,7 +83,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
diff --git a/TAO/tao/DoubleSeqC.cpp b/TAO/tao/DoubleSeqC.cpp
index 545317d37d0..ae7df05f915 100644
--- a/TAO/tao/DoubleSeqC.cpp
+++ b/TAO/tao/DoubleSeqC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/DynamicA.cpp b/TAO/tao/DynamicA.cpp
index 66db199d35f..f1cbfa9bc5b 100644
--- a/TAO/tao/DynamicA.cpp
+++ b/TAO/tao/DynamicA.cpp
@@ -36,12 +36,12 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_Dynamic_ParameterList_GUARD
@@ -65,6 +65,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_Dynamic_ParameterList_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -83,7 +84,7 @@ namespace Dynamic
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -103,12 +104,12 @@ namespace Dynamic
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_Dynamic_ExceptionList_GUARD
@@ -132,6 +133,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_Dynamic_ExceptionList_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -150,7 +152,7 @@ namespace Dynamic
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -170,7 +172,7 @@ namespace Dynamic
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
@@ -229,7 +231,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
diff --git a/TAO/tao/DynamicC.cpp b/TAO/tao/DynamicC.cpp
index 67f9cf132a1..30656ccf787 100644
--- a/TAO/tao/DynamicC.cpp
+++ b/TAO/tao/DynamicC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/Dynamic_ParameterA.cpp b/TAO/tao/Dynamic_ParameterA.cpp
index c294007298d..672a92e1ed7 100644
--- a/TAO/tao/Dynamic_ParameterA.cpp
+++ b/TAO/tao/Dynamic_ParameterA.cpp
@@ -31,12 +31,13 @@
 #include "tao/Alias_TypeCode_Static.h"
 #include "tao/Struct_TypeCode_Static.h"
 #include "tao/TypeCode_Struct_Field.h"
+#include "tao/Recursive_Type_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
+// be\be_visitor_typecode/struct_typecode.cpp:87
 
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_Dynamic_Parameter[] =
   {
@@ -45,10 +46,9 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
   _tao_tc_Dynamic_Parameter (
     CORBA::tk_struct,
     "IDL:Dynamic/Parameter:1.0",
@@ -65,7 +65,7 @@ namespace Dynamic
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
diff --git a/TAO/tao/Dynamic_ParameterC.cpp b/TAO/tao/Dynamic_ParameterC.cpp
index 9b9ed5f8582..b681433ed5e 100644
--- a/TAO/tao/Dynamic_ParameterC.cpp
+++ b/TAO/tao/Dynamic_ParameterC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/Dynamic_ParameterC.h b/TAO/tao/Dynamic_ParameterC.h
index 64cf2cb2410..71b2eb46d8f 100644
--- a/TAO/tao/Dynamic_ParameterC.h
+++ b/TAO/tao/Dynamic_ParameterC.h
@@ -45,6 +45,7 @@
 #include "tao/Environment.h"
 #include "tao/TypeCode_Constants.h"
 #include "tao/Any.h"
+#include "tao/TypeCode.h"
 #include "tao/VarOut_T.h"
 
 #include "tao/ParameterModeC.h"
diff --git a/TAO/tao/FloatSeqA.cpp b/TAO/tao/FloatSeqA.cpp
index 8b0c9c2dc3c..c20ad0d02ba 100644
--- a/TAO/tao/FloatSeqA.cpp
+++ b/TAO/tao/FloatSeqA.cpp
@@ -35,12 +35,12 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_CORBA_FloatSeq_GUARD
@@ -64,6 +64,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_CORBA_FloatSeq_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -82,7 +83,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
diff --git a/TAO/tao/FloatSeqC.cpp b/TAO/tao/FloatSeqC.cpp
index 9ef665733f4..ed0f705f682 100644
--- a/TAO/tao/FloatSeqC.cpp
+++ b/TAO/tao/FloatSeqC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/GIOPA.cpp b/TAO/tao/GIOPA.cpp
index 443880640c3..8f51194a1f5 100644
--- a/TAO/tao/GIOPA.cpp
+++ b/TAO/tao/GIOPA.cpp
@@ -32,14 +32,15 @@
 #include "tao/String_TypeCode_Static.h"
 #include "tao/Struct_TypeCode_Static.h"
 #include "tao/TypeCode_Struct_Field.h"
-#include "tao/Union_TypeCode_Static.h"
 #include "tao/TypeCode_Case_T.h"
+#include "tao/Union_TypeCode_Static.h"
+#include "tao/Recursive_Type_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -59,7 +60,7 @@ namespace GIOP
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
+// be\be_visitor_typecode/struct_typecode.cpp:87
 
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_GIOP_Version[] =
   {
@@ -68,10 +69,9 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
   _tao_tc_GIOP_Version (
     CORBA::tk_struct,
     "IDL:omg.org/GIOP/Version:1.0",
@@ -88,7 +88,7 @@ namespace GIOP
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
+// be\be_visitor_typecode/struct_typecode.cpp:87
 
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_GIOP_IORAddressingInfo[] =
   {
@@ -97,10 +97,9 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
   _tao_tc_GIOP_IORAddressingInfo (
     CORBA::tk_struct,
     "IDL:omg.org/GIOP/IORAddressingInfo:1.0",
@@ -117,7 +116,12 @@ namespace GIOP
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/union_typecode.cpp:47
+// be\be_visitor_typecode/union_typecode.cpp:58
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 static TAO::TypeCode::Case_T<CORBA::Short, char const *, CORBA::TypeCode_ptr const *> const _tao_cases_GIOP_TargetAddress_0 (0, "object_key", &CORBA::_tc_OctetSeq);
 static TAO::TypeCode::Case_T<CORBA::Short, char const *, CORBA::TypeCode_ptr const *> const _tao_cases_GIOP_TargetAddress_1 (1, "profile", &IOP::_tc_TaggedProfile);
@@ -133,8 +137,7 @@ static TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * co
 
 static TAO::TypeCode::Union<char const *,
                             CORBA::TypeCode_ptr const *,
-                            TAO::TypeCode::Case<char const *,
-                                                CORBA::TypeCode_ptr const *> const * const *,
+                            TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *,
                             TAO::Null_RefCount_Policy>
   _tao_tc_GIOP_TargetAddress (
     "IDL:omg.org/GIOP/TargetAddress:1.0",
@@ -152,7 +155,7 @@ namespace GIOP
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -210,7 +213,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -268,7 +271,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_union/any_op_cs.cpp:54
+// be\be_visitor_union/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp
index 5d0cf2e8415..da8775c8c5f 100644
--- a/TAO/tao/GIOPC.cpp
+++ b/TAO/tao/GIOPC.cpp
@@ -43,7 +43,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/GIOPC.h b/TAO/tao/GIOPC.h
index 5fffb7df006..a4881f49a50 100644
--- a/TAO/tao/GIOPC.h
+++ b/TAO/tao/GIOPC.h
@@ -203,21 +203,21 @@ namespace GIOP
     typedef TargetAddress_var _var_type;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_union_branch/public_ch.cpp:514
+    // be\be_visitor_union_branch/public_ch.cpp:557
     
     void object_key (const CORBA::OctetSeq &);
     const CORBA::OctetSeq &object_key (void) const;
     CORBA::OctetSeq &object_key (void);
     
     // TAO_IDL - Generated from
-    // be\be_visitor_union_branch/public_ch.cpp:622
+    // be\be_visitor_union_branch/public_ch.cpp:665
     
     void profile (const IOP::TaggedProfile &);
     const IOP::TaggedProfile &profile (void) const;
     IOP::TaggedProfile &profile (void);
     
     // TAO_IDL - Generated from
-    // be\be_visitor_union_branch/public_ch.cpp:622
+    // be\be_visitor_union_branch/public_ch.cpp:665
     
     void ior (const ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &);
     const ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &ior (void) const;
@@ -234,13 +234,13 @@ namespace GIOP
     union
     {
       // TAO_IDL - Generated from
-      // be\be_visitor_union_branch/private_ch.cpp:412
+      // be\be_visitor_union_branch/private_ch.cpp:451
       CORBA::OctetSeq *object_key_;
       // TAO_IDL - Generated from
-      // be\be_visitor_union_branch/private_ch.cpp:487
+      // be\be_visitor_union_branch/private_ch.cpp:526
       IOP::TaggedProfile *profile_;
       // TAO_IDL - Generated from
-      // be\be_visitor_union_branch/private_ch.cpp:487
+      // be\be_visitor_union_branch/private_ch.cpp:526
       ACE_NESTED_CLASS (GIOP, IORAddressingInfo) *ior_;
     } u_;
     
diff --git a/TAO/tao/GIOPC.inl b/TAO/tao/GIOPC.inl
index 94f7dc88e6a..a4780ad16c0 100644
--- a/TAO/tao/GIOPC.inl
+++ b/TAO/tao/GIOPC.inl
@@ -60,7 +60,7 @@ GIOP::TargetAddress::_d (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_union_branch/public_ci.cpp:899
+// be\be_visitor_union_branch/public_ci.cpp:833
 
 // Accessor to set the member.
 ACE_INLINE
@@ -93,7 +93,7 @@ GIOP::TargetAddress::object_key (void)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_union_branch/public_ci.cpp:1208
+// be\be_visitor_union_branch/public_ci.cpp:1142
 
 // Accessor to set the member.
 ACE_INLINE
@@ -126,7 +126,7 @@ GIOP::TargetAddress::profile (void)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_union_branch/public_ci.cpp:1208
+// be\be_visitor_union_branch/public_ci.cpp:1142
 
 // Accessor to set the member.
 ACE_INLINE
diff --git a/TAO/tao/IIOPA.cpp b/TAO/tao/IIOPA.cpp
index 3a0d62b0802..3915ddc3c03 100644
--- a/TAO/tao/IIOPA.cpp
+++ b/TAO/tao/IIOPA.cpp
@@ -33,12 +33,13 @@
 #include "tao/String_TypeCode_Static.h"
 #include "tao/Struct_TypeCode_Static.h"
 #include "tao/TypeCode_Struct_Field.h"
+#include "tao/Recursive_Type_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
+// be\be_visitor_typecode/struct_typecode.cpp:87
 
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IIOP_ListenPoint[] =
   {
@@ -47,10 +48,9 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
   _tao_tc_IIOP_ListenPoint (
     CORBA::tk_struct,
     "IDL:omg.org/IIOP/ListenPoint:1.0",
@@ -67,12 +67,12 @@ namespace IIOP
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_IIOP_ListenPointList_GUARD
@@ -96,6 +96,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_IIOP_ListenPointList_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -114,7 +115,12 @@ namespace IIOP
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IIOP_BiDirIIOPServiceContext[] =
   {
@@ -122,10 +128,9 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
   _tao_tc_IIOP_BiDirIIOPServiceContext (
     CORBA::tk_struct,
     "IDL:omg.org/IIOP/BiDirIIOPServiceContext:1.0",
@@ -142,7 +147,7 @@ namespace IIOP
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -200,7 +205,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
@@ -259,7 +264,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp
index 5db2f8c6682..b0ef17be4e1 100644
--- a/TAO/tao/IIOPC.cpp
+++ b/TAO/tao/IIOPC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/IIOP_EndpointsA.cpp b/TAO/tao/IIOP_EndpointsA.cpp
index 580430d7ee0..5ea6a8c8da9 100644
--- a/TAO/tao/IIOP_EndpointsA.cpp
+++ b/TAO/tao/IIOP_EndpointsA.cpp
@@ -33,12 +33,13 @@
 #include "tao/String_TypeCode_Static.h"
 #include "tao/Struct_TypeCode_Static.h"
 #include "tao/TypeCode_Struct_Field.h"
+#include "tao/Recursive_Type_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
+// be\be_visitor_typecode/struct_typecode.cpp:87
 
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_TAO_IIOP_Endpoint_Info[] =
   {
@@ -48,10 +49,9 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
   _tao_tc_TAO_IIOP_Endpoint_Info (
     CORBA::tk_struct,
     "IDL:TAO/IIOP_Endpoint_Info:1.0",
@@ -68,12 +68,12 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_TAO_IIOPEndpointSequence_GUARD
@@ -97,6 +97,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_TAO_IIOPEndpointSequence_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -115,7 +116,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -173,7 +174,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
diff --git a/TAO/tao/IIOP_EndpointsC.cpp b/TAO/tao/IIOP_EndpointsC.cpp
index e50a1032d00..819ea3f62b6 100644
--- a/TAO/tao/IIOP_EndpointsC.cpp
+++ b/TAO/tao/IIOP_EndpointsC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp
index b16ffbbd190..9053a1fe2c3 100644
--- a/TAO/tao/IOPC.cpp
+++ b/TAO/tao/IOPC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/IOP_IORA.cpp b/TAO/tao/IOP_IORA.cpp
index c7580feaf97..1c268452262 100644
--- a/TAO/tao/IOP_IORA.cpp
+++ b/TAO/tao/IOP_IORA.cpp
@@ -33,12 +33,13 @@
 #include "tao/String_TypeCode_Static.h"
 #include "tao/Struct_TypeCode_Static.h"
 #include "tao/TypeCode_Struct_Field.h"
+#include "tao/Recursive_Type_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -58,7 +59,12 @@ namespace IOP
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IOP_TaggedProfile[] =
   {
@@ -67,10 +73,9 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
   _tao_tc_IOP_TaggedProfile (
     CORBA::tk_struct,
     "IDL:omg.org/IOP/TaggedProfile:1.0",
@@ -87,12 +92,12 @@ namespace IOP
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_IOP_TaggedProfileSeq_GUARD
@@ -116,6 +121,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_IOP_TaggedProfileSeq_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -134,7 +140,12 @@ namespace IOP
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IOP_IOR[] =
   {
@@ -143,10 +154,9 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
   _tao_tc_IOP_IOR (
     CORBA::tk_struct,
     "IDL:omg.org/IOP/IOR:1.0",
@@ -163,7 +173,7 @@ namespace IOP
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -183,7 +193,12 @@ namespace IOP
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IOP_TaggedComponent[] =
   {
@@ -192,10 +207,9 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
   _tao_tc_IOP_TaggedComponent (
     CORBA::tk_struct,
     "IDL:omg.org/IOP/TaggedComponent:1.0",
@@ -212,12 +226,12 @@ namespace IOP
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_IOP_MultipleComponentProfile_GUARD
@@ -241,6 +255,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_IOP_MultipleComponentProfile_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -259,12 +274,12 @@ namespace IOP
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_IOP_TaggedComponentList_GUARD
@@ -288,6 +303,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_IOP_TaggedComponentList_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -306,12 +322,12 @@ namespace IOP
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_IOP_TaggedComponentSeq_GUARD
@@ -335,6 +351,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_IOP_TaggedComponentSeq_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -353,7 +370,7 @@ namespace IOP
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -373,7 +390,12 @@ namespace IOP
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IOP_ServiceContext[] =
   {
@@ -382,10 +404,9 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
   _tao_tc_IOP_ServiceContext (
     CORBA::tk_struct,
     "IDL:omg.org/IOP/ServiceContext:1.0",
@@ -402,12 +423,12 @@ namespace IOP
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_IOP_ServiceContextList_GUARD
@@ -431,6 +452,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_IOP_ServiceContextList_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -449,7 +471,7 @@ namespace IOP
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -507,7 +529,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
@@ -566,7 +588,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -624,7 +646,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -682,7 +704,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
@@ -741,7 +763,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
@@ -800,7 +822,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
@@ -859,7 +881,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -917,7 +939,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
diff --git a/TAO/tao/IOP_IORC.cpp b/TAO/tao/IOP_IORC.cpp
index 0bd9d24f103..816b166ac49 100644
--- a/TAO/tao/IOP_IORC.cpp
+++ b/TAO/tao/IOP_IORC.cpp
@@ -38,7 +38,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/IOP_IORC.h b/TAO/tao/IOP_IORC.h
index f3269d1c314..496f143ca0a 100644
--- a/TAO/tao/IOP_IORC.h
+++ b/TAO/tao/IOP_IORC.h
@@ -651,17 +651,17 @@ namespace IOP
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
   
-  const IOP::ProfileId TAG_UIPMC = 1413566220U;
+  const IOP::ProfileId TAG_UIPMC = 3U;
   
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
   
-  const IOP::ComponentId TAG_GROUP = 1413566211U;
+  const IOP::ComponentId TAG_GROUP = 39U;
   
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
   
-  const IOP::ComponentId TAG_GROUP_IIOP = 1413566212U;
+  const IOP::ComponentId TAG_GROUP_IIOP = 40U;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
diff --git a/TAO/tao/InterceptorC.cpp b/TAO/tao/InterceptorC.cpp
index 44b3d8034fe..cc1c0e0b458 100644
--- a/TAO/tao/InterceptorC.cpp
+++ b/TAO/tao/InterceptorC.cpp
@@ -38,7 +38,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
@@ -102,15 +102,9 @@ PortableInterceptor::Interceptor::_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Interceptor::_nil ();
-    }
-  
-  Interceptor_ptr proxy =
-    dynamic_cast<Interceptor_ptr> (_tao_objref);
-  
-  return Interceptor::_duplicate (proxy);
+  return Interceptor::_duplicate (
+      dynamic_cast<Interceptor_ptr> (_tao_objref)
+    );
 }
 
 PortableInterceptor::Interceptor_ptr
@@ -119,15 +113,9 @@ PortableInterceptor::Interceptor::_unchecked_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Interceptor::_nil ();
-    }
-  
-  Interceptor_ptr proxy =
-    dynamic_cast<Interceptor_ptr> (_tao_objref);
-  
-  return Interceptor::_duplicate (proxy);
+  return Interceptor::_duplicate (
+      dynamic_cast<Interceptor_ptr> (_tao_objref)
+    );
 }
 
 PortableInterceptor::Interceptor_ptr
diff --git a/TAO/tao/InvalidSlotA.cpp b/TAO/tao/InvalidSlotA.cpp
index 611548c2169..265b0414b41 100644
--- a/TAO/tao/InvalidSlotA.cpp
+++ b/TAO/tao/InvalidSlotA.cpp
@@ -36,14 +36,13 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
+// be\be_visitor_typecode/struct_typecode.cpp:87
 
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableInterceptor_InvalidSlot = 0;
 static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
   _tao_tc_PortableInterceptor_InvalidSlot (
     CORBA::tk_except,
     "IDL:omg.org/PortableInterceptor/InvalidSlot:1.0",
@@ -60,7 +59,7 @@ namespace PortableInterceptor
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
+// be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
 {
diff --git a/TAO/tao/InvalidSlotC.cpp b/TAO/tao/InvalidSlotC.cpp
index 9315a2123de..ede7638814e 100644
--- a/TAO/tao/InvalidSlotC.cpp
+++ b/TAO/tao/InvalidSlotC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:291
+// be\be_codegen.cpp:291
 
 
 #include "InvalidSlotC.h"
@@ -39,7 +39,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
@@ -48,7 +48,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from 
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_cs.cpp:63
+// be\be_visitor_exception/exception_cs.cpp:63
 
 PortableInterceptor::InvalidSlot::InvalidSlot (void)
   : CORBA::UserException (
@@ -153,7 +153,7 @@ CORBA::TypeCode_ptr PortableInterceptor::InvalidSlot::_tao_type (void) const
 }
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/cdr_op_cs.cpp:60
+// be\be_visitor_exception/cdr_op_cs.cpp:60
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
diff --git a/TAO/tao/InvalidSlotC.h b/TAO/tao/InvalidSlotC.h
index 6661c034224..03b060a0081 100644
--- a/TAO/tao/InvalidSlotC.h
+++ b/TAO/tao/InvalidSlotC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_INVALIDSLOTC_H_
 #define _TAO_IDL_ORIG_INVALIDSLOTC_H_
@@ -59,13 +59,13 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace PortableInterceptor
 {
   
   // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:51
+  // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_PORTABLEINTERCEPTOR_INVALIDSLOT_CH_)
 #define _PORTABLEINTERCEPTOR_INVALIDSLOT_CH_
@@ -102,25 +102,25 @@ namespace PortableInterceptor
       );
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:127
+    // be\be_visitor_exception/exception_ch.cpp:129
     
     virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
   
   // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   extern TAO_Export ::CORBA::TypeCode_ptr const _tc_InvalidSlot;
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module PortableInterceptor
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:61
+// be\be_visitor_traits.cpp:61
 
 // Traits specializations.
 namespace TAO
@@ -128,7 +128,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_ch.cpp:52
+// be\be_visitor_exception/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::InvalidSlot &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::InvalidSlot*); // noncopying version
@@ -136,13 +136,13 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::InvalidSlot *&);
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/cdr_op_ch.cpp:52
+// be\be_visitor_exception/cdr_op_ch.cpp:52
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::InvalidSlot &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::InvalidSlot &);
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:955
+// be\be_codegen.cpp:955
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/TAO/tao/LongDoubleSeqA.cpp b/TAO/tao/LongDoubleSeqA.cpp
index d67d995c9ab..fe577fac602 100644
--- a/TAO/tao/LongDoubleSeqA.cpp
+++ b/TAO/tao/LongDoubleSeqA.cpp
@@ -35,12 +35,12 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_CORBA_LongDoubleSeq_GUARD
@@ -64,6 +64,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_CORBA_LongDoubleSeq_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -82,7 +83,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
diff --git a/TAO/tao/LongDoubleSeqC.cpp b/TAO/tao/LongDoubleSeqC.cpp
index cb378c5b054..0e1dd30f277 100644
--- a/TAO/tao/LongDoubleSeqC.cpp
+++ b/TAO/tao/LongDoubleSeqC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/LongLongSeqA.cpp b/TAO/tao/LongLongSeqA.cpp
index 949e1dbef95..26cd80eaacc 100644
--- a/TAO/tao/LongLongSeqA.cpp
+++ b/TAO/tao/LongLongSeqA.cpp
@@ -35,12 +35,12 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_CORBA_LongLongSeq_GUARD
@@ -64,6 +64,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_CORBA_LongLongSeq_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -82,7 +83,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
diff --git a/TAO/tao/LongLongSeqC.cpp b/TAO/tao/LongLongSeqC.cpp
index 28fa3e318f1..d0142375188 100644
--- a/TAO/tao/LongLongSeqC.cpp
+++ b/TAO/tao/LongLongSeqC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/LongSeqA.cpp b/TAO/tao/LongSeqA.cpp
index 58a674d9360..3664a6f3f21 100644
--- a/TAO/tao/LongSeqA.cpp
+++ b/TAO/tao/LongSeqA.cpp
@@ -35,12 +35,12 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_CORBA_LongSeq_GUARD
@@ -64,6 +64,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_CORBA_LongSeq_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -82,7 +83,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
diff --git a/TAO/tao/LongSeqC.cpp b/TAO/tao/LongSeqC.cpp
index 39069521124..fcb07e3e606 100644
--- a/TAO/tao/LongSeqC.cpp
+++ b/TAO/tao/LongSeqC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/Messaging_PolicyValueA.cpp b/TAO/tao/Messaging_PolicyValueA.cpp
index 5b53663f3c1..6b5404ab811 100644
--- a/TAO/tao/Messaging_PolicyValueA.cpp
+++ b/TAO/tao/Messaging_PolicyValueA.cpp
@@ -33,12 +33,18 @@
 #include "tao/String_TypeCode_Static.h"
 #include "tao/Struct_TypeCode_Static.h"
 #include "tao/TypeCode_Struct_Field.h"
+#include "tao/Recursive_Type_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_Messaging_PolicyValue[] =
   {
@@ -47,10 +53,9 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
   _tao_tc_Messaging_PolicyValue (
     CORBA::tk_struct,
     "IDL:omg.org/Messaging/PolicyValue:1.0",
@@ -67,12 +72,12 @@ namespace Messaging
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_Messaging_PolicyValueSeq_GUARD
@@ -96,6 +101,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_Messaging_PolicyValueSeq_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -114,7 +120,7 @@ namespace Messaging
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -172,7 +178,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
diff --git a/TAO/tao/Messaging_PolicyValueC.cpp b/TAO/tao/Messaging_PolicyValueC.cpp
index ffa5d682e1d..3bb08c79911 100644
--- a/TAO/tao/Messaging_PolicyValueC.cpp
+++ b/TAO/tao/Messaging_PolicyValueC.cpp
@@ -38,7 +38,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/Messaging_PolicyValueC.h b/TAO/tao/Messaging_PolicyValueC.h
index d9e4470aa96..ab003706b1e 100644
--- a/TAO/tao/Messaging_PolicyValueC.h
+++ b/TAO/tao/Messaging_PolicyValueC.h
@@ -70,57 +70,57 @@
 
 namespace Messaging
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-
+  
   struct PolicyValue;
-
+  
   typedef
     TAO_Var_Var_T<
         PolicyValue
       >
     PolicyValue_var;
-
+  
   typedef
     TAO_Out_T<
         PolicyValue,
         PolicyValue_var
       >
     PolicyValue_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-
+  
   struct TAO_Export PolicyValue
   {
     typedef PolicyValue_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     CORBA::PolicyType ptype;
     CORBA::OctetSeq pvalue;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyValue;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_MESSAGING_POLICYVALUESEQ_CH_)
 #define _MESSAGING_POLICYVALUESEQ_CH_
-
+  
   class PolicyValueSeq;
-
+  
   typedef
     TAO_VarSeq_Var_T<
         PolicyValueSeq,
         PolicyValue
       >
     PolicyValueSeq_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         PolicyValueSeq,
@@ -128,7 +128,7 @@ namespace Messaging
         PolicyValue
       >
     PolicyValueSeq_out;
-
+  
   class TAO_Export PolicyValueSeq
     : public
         TAO_Unbounded_Sequence<
@@ -141,32 +141,32 @@ namespace Messaging
     PolicyValueSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        PolicyValue* buffer,
+        PolicyValue* buffer, 
         CORBA::Boolean release = 0
       );
     PolicyValueSeq (const PolicyValueSeq &);
     ~PolicyValueSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef PolicyValueSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyValueSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const IOP::ComponentId TAG_POLICIES = 2U;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const IOP::ServiceId INVOCATION_POLICIES = 7U;
 
 // TAO_IDL - Generated from
diff --git a/TAO/tao/Messaging_SyncScopeC.cpp b/TAO/tao/Messaging_SyncScopeC.cpp
index 78f81d090d7..b515509a832 100644
--- a/TAO/tao/Messaging_SyncScopeC.cpp
+++ b/TAO/tao/Messaging_SyncScopeC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/ObjectIdListA.cpp b/TAO/tao/ObjectIdListA.cpp
index a04726855a3..db1e3a6e222 100644
--- a/TAO/tao/ObjectIdListA.cpp
+++ b/TAO/tao/ObjectIdListA.cpp
@@ -33,7 +33,7 @@
 #include "tao/String_TypeCode_Static.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -53,12 +53,12 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_CORBA_ORB_ObjectIdList_GUARD
@@ -82,6 +82,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_CORBA_ORB_ObjectIdList_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
diff --git a/TAO/tao/ObjectIdListC.cpp b/TAO/tao/ObjectIdListC.cpp
index 801332187b8..a46f7400069 100644
--- a/TAO/tao/ObjectIdListC.cpp
+++ b/TAO/tao/ObjectIdListC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp
index e0fea62d9ea..1c6754f5847 100644
--- a/TAO/tao/Object_KeyC.cpp
+++ b/TAO/tao/Object_KeyC.cpp
@@ -42,7 +42,7 @@
 #include "ace/os_include/os_ctype.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/OctetSeqA.cpp b/TAO/tao/OctetSeqA.cpp
index 8a63efa4664..e81a0d009be 100644
--- a/TAO/tao/OctetSeqA.cpp
+++ b/TAO/tao/OctetSeqA.cpp
@@ -35,12 +35,12 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_CORBA_OctetSeq_GUARD
@@ -64,6 +64,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_CORBA_OctetSeq_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -82,7 +83,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp
index ae05d6dc3e0..0e00b3c9aaf 100644
--- a/TAO/tao/OctetSeqC.cpp
+++ b/TAO/tao/OctetSeqC.cpp
@@ -38,7 +38,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/PICurrentC.cpp b/TAO/tao/PICurrentC.cpp
index c1a71eaaddd..197b87f3c07 100644
--- a/TAO/tao/PICurrentC.cpp
+++ b/TAO/tao/PICurrentC.cpp
@@ -38,7 +38,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
@@ -102,15 +102,9 @@ PortableInterceptor::Current::_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Current::_nil ();
-    }
-  
-  Current_ptr proxy =
-    dynamic_cast<Current_ptr> (_tao_objref);
-  
-  return Current::_duplicate (proxy);
+  return Current::_duplicate (
+      dynamic_cast<Current_ptr> (_tao_objref)
+    );
 }
 
 PortableInterceptor::Current_ptr
@@ -119,15 +113,9 @@ PortableInterceptor::Current::_unchecked_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Current::_nil ();
-    }
-  
-  Current_ptr proxy =
-    dynamic_cast<Current_ptr> (_tao_objref);
-  
-  return Current::_duplicate (proxy);
+  return Current::_duplicate (
+      dynamic_cast<Current_ptr> (_tao_objref)
+    );
 }
 
 PortableInterceptor::Current_ptr
diff --git a/TAO/tao/PIForwardRequestA.cpp b/TAO/tao/PIForwardRequestA.cpp
index 54623f6c617..bd8c5684d25 100644
--- a/TAO/tao/PIForwardRequestA.cpp
+++ b/TAO/tao/PIForwardRequestA.cpp
@@ -41,7 +41,7 @@
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_PortableInterceptor_ForwardRequest[] =
   {
     { "forward", &CORBA::_tc_Object }
-
+    
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -53,7 +53,7 @@ static TAO::TypeCode::Struct<char const *,
     "ForwardRequest",
     _tao_fields_PortableInterceptor_ForwardRequest,
     1);
-
+  
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ForwardRequest =
@@ -62,7 +62,7 @@ namespace PortableInterceptor
 
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -74,12 +74,12 @@ namespace TAO
     )
   {
     CORBA::String_var id;
-
+    
     if (!(cdr >> id.out ()))
       {
         return false;
       }
-
+    
     ACE_TRY_NEW_ENV
       {
         this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -90,7 +90,7 @@ namespace TAO
         return false;
       }
     ACE_ENDTRY;
-
+    
     return true;
   }
 }
diff --git a/TAO/tao/PIForwardRequestC.cpp b/TAO/tao/PIForwardRequestC.cpp
index 6108fd7a077..7ecc261b227 100644
--- a/TAO/tao/PIForwardRequestC.cpp
+++ b/TAO/tao/PIForwardRequestC.cpp
@@ -39,7 +39,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
@@ -47,7 +47,7 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableInterceptor::ForwardRequest::ForwardRequest (void)
@@ -131,7 +131,7 @@ void PortableInterceptor::ForwardRequest::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -144,7 +144,7 @@ void PortableInterceptor::ForwardRequest::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
diff --git a/TAO/tao/PIForwardRequestC.h b/TAO/tao/PIForwardRequestC.h
index 58931164882..50294ace702 100644
--- a/TAO/tao/PIForwardRequestC.h
+++ b/TAO/tao/PIForwardRequestC.h
@@ -28,8 +28,8 @@
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:153
 
-#ifndef _TAO_IDL_ORIG_PI_FORWARDREQUESTC_H_
-#define _TAO_IDL_ORIG_PI_FORWARDREQUESTC_H_
+#ifndef _TAO_IDL_ORIG_PIFORWARDREQUESTC_H_
+#define _TAO_IDL_ORIG_PIFORWARDREQUESTC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -66,7 +66,7 @@ namespace PortableInterceptor
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:51
+  // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_PORTABLEINTERCEPTOR_FORWARDREQUEST_CH_)
 #define _PORTABLEINTERCEPTOR_FORWARDREQUEST_CH_
@@ -111,7 +111,7 @@ namespace PortableInterceptor
       );
     
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:127
+    // be\be_visitor_exception/exception_ch.cpp:129
     
     virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
diff --git a/TAO/tao/PI_ForwardC.cpp b/TAO/tao/PI_ForwardC.cpp
index 73540f670ed..2887387a168 100644
--- a/TAO/tao/PI_ForwardC.cpp
+++ b/TAO/tao/PI_ForwardC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:291
+// be\be_codegen.cpp:291
 
 
 #include "PI_ForwardC.h"
@@ -42,7 +42,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
@@ -51,7 +51,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -71,7 +71,7 @@ namespace PortableInterceptor
 
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -91,7 +91,7 @@ namespace PortableInterceptor
 
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -111,7 +111,7 @@ namespace PortableInterceptor
 
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -131,7 +131,7 @@ namespace PortableInterceptor
 
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -151,7 +151,7 @@ namespace PortableInterceptor
 
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -171,7 +171,7 @@ namespace PortableInterceptor
 
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -191,7 +191,7 @@ namespace PortableInterceptor
 
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -207,3 +207,5 @@ namespace PortableInterceptor
   ::CORBA::TypeCode_ptr const _tc_ReplyStatus =
     &_tao_tc_PortableInterceptor_ReplyStatus;
 }
+
+
diff --git a/TAO/tao/PI_ForwardC.h b/TAO/tao/PI_ForwardC.h
index dc7bd5e48f6..88c027c4e17 100644
--- a/TAO/tao/PI_ForwardC.h
+++ b/TAO/tao/PI_ForwardC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_PI_FORWARDC_H_
 #define _TAO_IDL_ORIG_PI_FORWARDC_H_
@@ -62,110 +62,110 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace PortableInterceptor
 {
   
   // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:413
+  // be\be_visitor_typedef/typedef_ch.cpp:413
   
   typedef char * ServerId;
   typedef CORBA::String_var ServerId_var;
   typedef CORBA::String_out ServerId_out;
   
   // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServerId;
   
   // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:413
+  // be\be_visitor_typedef/typedef_ch.cpp:413
   
   typedef char * ORBId;
   typedef CORBA::String_var ORBId_var;
   typedef CORBA::String_out ORBId_out;
   
   // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ORBId;
   
   // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:472
+  // be\be_visitor_typedef/typedef_ch.cpp:472
   
   typedef CORBA::StringSeq AdapterName;
   typedef CORBA::StringSeq_var AdapterName_var;
   typedef CORBA::StringSeq_out AdapterName_out;
   
   // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   extern TAO_Export ::CORBA::TypeCode_ptr const _tc_AdapterName;
   
   // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:472
+  // be\be_visitor_typedef/typedef_ch.cpp:472
   
   typedef CORBA::OctetSeq ObjectId;
   typedef CORBA::OctetSeq_var ObjectId_var;
   typedef CORBA::OctetSeq_out ObjectId_out;
   
   // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ObjectId;
   
   // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:379
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::Long AdapterManagerId;
   typedef CORBA::Long_out AdapterManagerId_out;
   
   // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   extern TAO_Export ::CORBA::TypeCode_ptr const _tc_AdapterManagerId;
   
   // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:379
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::Short AdapterState;
   typedef CORBA::Short_out AdapterState_out;
   
   // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   extern TAO_Export ::CORBA::TypeCode_ptr const _tc_AdapterState;
   
   // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:379
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::ULong SlotId;
   typedef CORBA::ULong_out SlotId_out;
   
   // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   extern TAO_Export ::CORBA::TypeCode_ptr const _tc_SlotId;
   
   // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:379
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::Short ReplyStatus;
   typedef CORBA::Short_out ReplyStatus_out;
   
   // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ReplyStatus;
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module PortableInterceptor
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:61
+// be\be_visitor_traits.cpp:61
 
 // Traits specializations.
 namespace TAO
@@ -173,7 +173,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:955
+// be\be_codegen.cpp:955
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/TAO/tao/ParameterModeA.cpp b/TAO/tao/ParameterModeA.cpp
index 6581f8715e1..7014fcef47a 100644
--- a/TAO/tao/ParameterModeA.cpp
+++ b/TAO/tao/ParameterModeA.cpp
@@ -35,7 +35,7 @@
 #include "tao/Any_Basic_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
+// be\be_visitor_typecode/enum_typecode.cpp:34
 
 static char const * const _tao_enumerators_CORBA_ParameterMode[] =
   {
@@ -63,7 +63,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
+// be\be_visitor_enum/any_op_cs.cpp:52
 
 void operator<<= (
     CORBA::Any &_tao_any,
diff --git a/TAO/tao/ParameterModeC.cpp b/TAO/tao/ParameterModeC.cpp
index 2c438c1a24d..3040509bd76 100644
--- a/TAO/tao/ParameterModeC.cpp
+++ b/TAO/tao/ParameterModeC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/PolicyA.cpp b/TAO/tao/PolicyA.cpp
index d09e7c674d7..67be5692475 100644
--- a/TAO/tao/PolicyA.cpp
+++ b/TAO/tao/PolicyA.cpp
@@ -38,7 +38,7 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -58,7 +58,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
+// be\be_visitor_typecode/struct_typecode.cpp:87
 
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_PolicyError[] =
   {
@@ -66,10 +66,9 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_PolicyError (
     CORBA::tk_except,
     "IDL:omg.org/CORBA/PolicyError:1.0",
@@ -86,7 +85,12 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_InvalidPolicies[] =
   {
@@ -94,10 +98,9 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_InvalidPolicies (
     CORBA::tk_except,
     "IDL:omg.org/CORBA/InvalidPolicies:1.0",
@@ -114,7 +117,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
+// be\be_visitor_typecode/objref_typecode.cpp:76
 
 static TAO::TypeCode::Objref<char const *,
                              TAO::Null_RefCount_Policy>
@@ -132,7 +135,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
+// be\be_visitor_typecode/objref_typecode.cpp:76
 
 static TAO::TypeCode::Objref<char const *,
                              TAO::Null_RefCount_Policy>
@@ -150,7 +153,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
+// be\be_visitor_typecode/objref_typecode.cpp:76
 
 static TAO::TypeCode::Objref<char const *,
                              TAO::Null_RefCount_Policy>
@@ -168,7 +171,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
+// be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
 {
@@ -256,7 +259,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
+// be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
 {
@@ -344,7 +347,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// be\be_visitor_interface/any_op_cs.cpp:50
 
 namespace TAO
 {
@@ -402,7 +405,7 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// be\be_visitor_interface/any_op_cs.cpp:50
 
 namespace TAO
 {
@@ -477,7 +480,7 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// be\be_visitor_interface/any_op_cs.cpp:50
 
 namespace TAO
 {
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index 6d04b497b02..7d0b9432492 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -47,7 +47,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
@@ -422,7 +422,7 @@ CORBA::PolicyType CORBA::Policy::policy_type (
       CORBA_Policy_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::Policy>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::Policy>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -653,15 +653,9 @@ CORBA::PolicyManager::_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return PolicyManager::_nil ();
-    }
-  
-  PolicyManager_ptr proxy =
-    dynamic_cast<PolicyManager_ptr> (_tao_objref);
-  
-  return PolicyManager::_duplicate (proxy);
+  return PolicyManager::_duplicate (
+      dynamic_cast<PolicyManager_ptr> (_tao_objref)
+    );
 }
 
 CORBA::PolicyManager_ptr
@@ -670,15 +664,9 @@ CORBA::PolicyManager::_unchecked_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return PolicyManager::_nil ();
-    }
-  
-  PolicyManager_ptr proxy =
-    dynamic_cast<PolicyManager_ptr> (_tao_objref);
-  
-  return PolicyManager::_duplicate (proxy);
+  return PolicyManager::_duplicate (
+      dynamic_cast<PolicyManager_ptr> (_tao_objref)
+    );
 }
 
 CORBA::PolicyManager_ptr
@@ -794,15 +782,9 @@ CORBA::PolicyCurrent::_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return PolicyCurrent::_nil ();
-    }
-  
-  PolicyCurrent_ptr proxy =
-    dynamic_cast<PolicyCurrent_ptr> (_tao_objref);
-  
-  return PolicyCurrent::_duplicate (proxy);
+  return PolicyCurrent::_duplicate (
+      dynamic_cast<PolicyCurrent_ptr> (_tao_objref)
+    );
 }
 
 CORBA::PolicyCurrent_ptr
@@ -811,15 +793,9 @@ CORBA::PolicyCurrent::_unchecked_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return PolicyCurrent::_nil ();
-    }
-  
-  PolicyCurrent_ptr proxy =
-    dynamic_cast<PolicyCurrent_ptr> (_tao_objref);
-  
-  return PolicyCurrent::_duplicate (proxy);
+  return PolicyCurrent::_duplicate (
+      dynamic_cast<PolicyCurrent_ptr> (_tao_objref)
+    );
 }
 
 CORBA::PolicyCurrent_ptr
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index 9473de1a3ce..6c04ac532f1 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -117,7 +117,7 @@ namespace CORBA
   const CORBA::PolicyErrorCode UNSUPPORTED_POLICY_VALUE = 4;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:51
+  // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_CORBA_POLICYERROR_CH_)
 #define _CORBA_POLICYERROR_CH_
@@ -162,7 +162,7 @@ namespace CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:127
+    // be\be_visitor_exception/exception_ch.cpp:129
     
     virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
@@ -175,7 +175,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:51
+  // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_CORBA_INVALIDPOLICIES_CH_)
 #define _CORBA_INVALIDPOLICIES_CH_
@@ -220,7 +220,7 @@ namespace CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:127
+    // be\be_visitor_exception/exception_ch.cpp:129
     
     virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
@@ -628,42 +628,42 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_POLICYCURRENT__TRAITS_CH_)
-#define _CORBA_POLICYCURRENT__TRAITS_CH_
+#if !defined (_CORBA_POLICYMANAGER__TRAITS_CH_)
+#define _CORBA_POLICYMANAGER__TRAITS_CH_
   
   template<>
-  struct TAO_Export Objref_Traits< ::CORBA::PolicyCurrent>
+  struct TAO_Export Objref_Traits< ::CORBA::PolicyManager>
   {
-    static ::CORBA::PolicyCurrent_ptr duplicate (
-        ::CORBA::PolicyCurrent_ptr
+    static ::CORBA::PolicyManager_ptr duplicate (
+        ::CORBA::PolicyManager_ptr
       );
     static void release (
-        ::CORBA::PolicyCurrent_ptr
+        ::CORBA::PolicyManager_ptr
       );
-    static ::CORBA::PolicyCurrent_ptr nil (void);
+    static ::CORBA::PolicyManager_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::PolicyCurrent_ptr p,
+        ::CORBA::PolicyManager_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_POLICYMANAGER__TRAITS_CH_)
-#define _CORBA_POLICYMANAGER__TRAITS_CH_
+#if !defined (_CORBA_POLICYCURRENT__TRAITS_CH_)
+#define _CORBA_POLICYCURRENT__TRAITS_CH_
   
   template<>
-  struct TAO_Export Objref_Traits< ::CORBA::PolicyManager>
+  struct TAO_Export Objref_Traits< ::CORBA::PolicyCurrent>
   {
-    static ::CORBA::PolicyManager_ptr duplicate (
-        ::CORBA::PolicyManager_ptr
+    static ::CORBA::PolicyCurrent_ptr duplicate (
+        ::CORBA::PolicyCurrent_ptr
       );
     static void release (
-        ::CORBA::PolicyManager_ptr
+        ::CORBA::PolicyCurrent_ptr
       );
-    static ::CORBA::PolicyManager_ptr nil (void);
+    static ::CORBA::PolicyCurrent_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::PolicyManager_ptr p,
+        ::CORBA::PolicyCurrent_ptr p,
         TAO_OutputCDR & cdr
       );
   };
diff --git a/TAO/tao/Policy_ForwardA.cpp b/TAO/tao/Policy_ForwardA.cpp
index 5f7c8f436d5..b764212b911 100644
--- a/TAO/tao/Policy_ForwardA.cpp
+++ b/TAO/tao/Policy_ForwardA.cpp
@@ -37,7 +37,7 @@
 #include "tao/Any_Basic_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -57,12 +57,12 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 namespace CORBA
 {
@@ -91,6 +91,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_CORBA_PolicyList_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -109,12 +110,12 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_CORBA_PolicyTypeSeq_GUARD
@@ -138,6 +139,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_CORBA_PolicyTypeSeq_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -156,7 +158,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
+// be\be_visitor_typecode/enum_typecode.cpp:34
 
 static char const * const _tao_enumerators_CORBA_SetOverrideType[] =
   {
@@ -183,7 +185,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
@@ -242,7 +244,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
@@ -301,7 +303,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
+// be\be_visitor_enum/any_op_cs.cpp:52
 
 void operator<<= (
     CORBA::Any &_tao_any,
diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp
index 46f576bb40b..86eac4a4651 100644
--- a/TAO/tao/Policy_ForwardC.cpp
+++ b/TAO/tao/Policy_ForwardC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp
index 59be946fe69..372b605dee9 100644
--- a/TAO/tao/PollableC.cpp
+++ b/TAO/tao/PollableC.cpp
@@ -31,6 +31,12 @@
 
 #include "PollableC.h"
 #include "tao/CDR.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode_Static.h"
+#include "tao/Objref_TypeCode_Static.h"
+#include "tao/Struct_TypeCode_Static.h"
+#include "tao/TypeCode_Struct_Field.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -38,7 +44,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
@@ -94,15 +100,9 @@ CORBA::Pollable::_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Pollable::_nil ();
-    }
-  
-  Pollable_ptr proxy =
-    dynamic_cast<Pollable_ptr> (_tao_objref);
-  
-  return Pollable::_duplicate (proxy);
+  return Pollable::_duplicate (
+      dynamic_cast<Pollable_ptr> (_tao_objref)
+    );
 }
 
 CORBA::Pollable_ptr
@@ -111,15 +111,9 @@ CORBA::Pollable::_unchecked_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Pollable::_nil ();
-    }
-  
-  Pollable_ptr proxy =
-    dynamic_cast<Pollable_ptr> (_tao_objref);
-  
-  return Pollable::_duplicate (proxy);
+  return Pollable::_duplicate (
+      dynamic_cast<Pollable_ptr> (_tao_objref)
+    );
 }
 
 CORBA::Pollable_ptr
@@ -227,15 +221,9 @@ CORBA::DIIPollable::_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DIIPollable::_nil ();
-    }
-  
-  DIIPollable_ptr proxy =
-    dynamic_cast<DIIPollable_ptr> (_tao_objref);
-  
-  return DIIPollable::_duplicate (proxy);
+  return DIIPollable::_duplicate (
+      dynamic_cast<DIIPollable_ptr> (_tao_objref)
+    );
 }
 
 CORBA::DIIPollable_ptr
@@ -244,15 +232,9 @@ CORBA::DIIPollable::_unchecked_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DIIPollable::_nil ();
-    }
-  
-  DIIPollable_ptr proxy =
-    dynamic_cast<DIIPollable_ptr> (_tao_objref);
-  
-  return DIIPollable::_duplicate (proxy);
+  return DIIPollable::_duplicate (
+      dynamic_cast<DIIPollable_ptr> (_tao_objref)
+    );
 }
 
 CORBA::DIIPollable_ptr
@@ -434,7 +416,29 @@ void CORBA::PollableSet::NoPossiblePollable::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr CORBA::PollableSet::NoPossiblePollable::_tao_type (void) const
+{
+  return ::CORBA::PollableSet::_tc_NoPossiblePollable;
+}
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_CORBA_PollableSet_NoPossiblePollable = 0;
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_PollableSet_NoPossiblePollable (
+    CORBA::tk_except,
+    "IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0",
+    "NoPossiblePollable",
+    _tao_fields_CORBA_PollableSet_NoPossiblePollable,
+    0);
+  
+::CORBA::TypeCode_ptr const CORBA::PollableSet::_tc_NoPossiblePollable =
+  &_tao_tc_CORBA_PollableSet_NoPossiblePollable;
 
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
@@ -518,7 +522,29 @@ void CORBA::PollableSet::UnknownPollable::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr CORBA::PollableSet::UnknownPollable::_tao_type (void) const
+{
+  return ::CORBA::PollableSet::_tc_UnknownPollable;
+}
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_CORBA_PollableSet_UnknownPollable = 0;
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_PollableSet_UnknownPollable (
+    CORBA::tk_except,
+    "IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0",
+    "UnknownPollable",
+    _tao_fields_CORBA_PollableSet_UnknownPollable,
+    0);
+  
+::CORBA::TypeCode_ptr const CORBA::PollableSet::_tc_UnknownPollable =
+  &_tao_tc_CORBA_PollableSet_UnknownPollable;
 
 CORBA::PollableSet::PollableSet (void)
 {}
@@ -532,15 +558,9 @@ CORBA::PollableSet::_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return PollableSet::_nil ();
-    }
-  
-  PollableSet_ptr proxy =
-    dynamic_cast<PollableSet_ptr> (_tao_objref);
-  
-  return PollableSet::_duplicate (proxy);
+  return PollableSet::_duplicate (
+      dynamic_cast<PollableSet_ptr> (_tao_objref)
+    );
 }
 
 CORBA::PollableSet_ptr
@@ -549,15 +569,9 @@ CORBA::PollableSet::_unchecked_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return PollableSet::_nil ();
-    }
-  
-  PollableSet_ptr proxy =
-    dynamic_cast<PollableSet_ptr> (_tao_objref);
-  
-  return PollableSet::_duplicate (proxy);
+  return PollableSet::_duplicate (
+      dynamic_cast<PollableSet_ptr> (_tao_objref)
+    );
 }
 
 CORBA::PollableSet_ptr
diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h
index c839cb8ec5e..e8229e935c6 100644
--- a/TAO/tao/PollableC.h
+++ b/TAO/tao/PollableC.h
@@ -315,7 +315,7 @@ namespace CORBA
     
     
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
+    // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_CORBA_POLLABLESET_NOPOSSIBLEPOLLABLE_CH_)
 #define _CORBA_POLLABLESET_NOPOSSIBLEPOLLABLE_CH_
@@ -350,13 +350,20 @@ namespace CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
+      // be\be_visitor_exception/exception_ch.cpp:129
+      
+      virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr const _tc_NoPossiblePollable;
 
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
+    // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_CORBA_POLLABLESET_UNKNOWNPOLLABLE_CH_)
 #define _CORBA_POLLABLESET_UNKNOWNPOLLABLE_CH_
@@ -391,8 +398,15 @@ namespace CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
+      // be\be_visitor_exception/exception_ch.cpp:129
+      
+      virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr const _tc_UnknownPollable;
 
 #endif /* end #if !defined */
     
@@ -489,27 +503,6 @@ namespace CORBA
 namespace TAO
 {
 
-#if !defined (_CORBA_POLLABLESET__TRAITS_CH_)
-#define _CORBA_POLLABLESET__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::CORBA::PollableSet>
-  {
-    static ::CORBA::PollableSet_ptr duplicate (
-        ::CORBA::PollableSet_ptr
-      );
-    static void release (
-        ::CORBA::PollableSet_ptr
-      );
-    static ::CORBA::PollableSet_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::PollableSet_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
 #if !defined (_CORBA_POLLABLE__TRAITS_CH_)
 #define _CORBA_POLLABLE__TRAITS_CH_
   
@@ -551,6 +544,27 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
+
+#if !defined (_CORBA_POLLABLESET__TRAITS_CH_)
+#define _CORBA_POLLABLESET__TRAITS_CH_
+  
+  template<>
+  struct TAO_Export Objref_Traits< ::CORBA::PollableSet>
+  {
+    static ::CORBA::PollableSet_ptr duplicate (
+        ::CORBA::PollableSet_ptr
+      );
+    static void release (
+        ::CORBA::PollableSet_ptr
+      );
+    static ::CORBA::PollableSet_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::PollableSet_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
 }
 
 // TAO_IDL - Generated from
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index 1b9324e8bfd..f2232e01981 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -41,7 +41,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/RequestInfoA.cpp b/TAO/tao/RequestInfoA.cpp
index 78d422c122d..b01b21aca7f 100644
--- a/TAO/tao/RequestInfoA.cpp
+++ b/TAO/tao/RequestInfoA.cpp
@@ -36,7 +36,7 @@
 #include "tao/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
+// be\be_visitor_typecode/objref_typecode.cpp:76
 
 static TAO::TypeCode::Objref<char const *,
                              TAO::Null_RefCount_Policy>
@@ -54,7 +54,7 @@ namespace PortableInterceptor
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// be\be_visitor_interface/any_op_cs.cpp:50
 
 namespace TAO
 {
diff --git a/TAO/tao/RequestInfoC.cpp b/TAO/tao/RequestInfoC.cpp
index fcb51f68945..c6d7e2d7cbd 100644
--- a/TAO/tao/RequestInfoC.cpp
+++ b/TAO/tao/RequestInfoC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:291
+// be\be_codegen.cpp:291
 
 
 #include "RequestInfoC.h"
@@ -38,7 +38,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
@@ -47,7 +47,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::RequestInfo.
 
@@ -102,15 +102,9 @@ PortableInterceptor::RequestInfo::_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return RequestInfo::_nil ();
-    }
-  
-  RequestInfo_ptr proxy =
-    dynamic_cast<RequestInfo_ptr> (_tao_objref);
-  
-  return RequestInfo::_duplicate (proxy);
+  return RequestInfo::_duplicate (
+      dynamic_cast<RequestInfo_ptr> (_tao_objref)
+    );
 }
 
 PortableInterceptor::RequestInfo_ptr
@@ -119,15 +113,9 @@ PortableInterceptor::RequestInfo::_unchecked_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return RequestInfo::_nil ();
-    }
-  
-  RequestInfo_ptr proxy =
-    dynamic_cast<RequestInfo_ptr> (_tao_objref);
-  
-  return RequestInfo::_duplicate (proxy);
+  return RequestInfo::_duplicate (
+      dynamic_cast<RequestInfo_ptr> (_tao_objref)
+    );
 }
 
 PortableInterceptor::RequestInfo_ptr
diff --git a/TAO/tao/RequestInfoC.h b/TAO/tao/RequestInfoC.h
index eb99d621da1..cce63fc73a8 100644
--- a/TAO/tao/RequestInfoC.h
+++ b/TAO/tao/RequestInfoC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_REQUESTINFOC_H_
 #define _TAO_IDL_ORIG_REQUESTINFOC_H_
@@ -47,6 +47,7 @@
 #include "tao/Object.h"
 #include "tao/TypeCode_Constants.h"
 #include "tao/Any.h"
+#include "tao/TypeCode.h"
 #include "tao/Objref_VarOut_T.h"
 
 #include "tao/PI_ForwardC.h"
@@ -70,13 +71,13 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace PortableInterceptor
 {
   
   // TAO_IDL - Generated from
-  // .\be\be_interface.cpp:598
+  // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO__VAR_OUT_CH_
@@ -99,7 +100,7 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO_CH_
@@ -134,7 +135,7 @@ namespace PortableInterceptor
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::ULong request_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -144,7 +145,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual char * operation (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -154,7 +155,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::Dynamic::ParameterList * arguments (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -164,7 +165,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::Dynamic::ExceptionList * exceptions (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -174,7 +175,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::Dynamic::ContextList * contexts (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -184,7 +185,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::Dynamic::RequestContext * operation_context (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -194,7 +195,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Any * result (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -204,7 +205,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean response_expected (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -214,7 +215,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual Messaging::SyncScope sync_scope (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -224,7 +225,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual PortableInterceptor::ReplyStatus reply_status (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -234,7 +235,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Object_ptr forward_reference (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -244,7 +245,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Any * get_slot (
         ::PortableInterceptor::SlotId id
@@ -256,7 +257,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::IOP::ServiceContext * get_request_service_context (
         ::IOP::ServiceId id
@@ -267,7 +268,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::IOP::ServiceContext * get_reply_service_context (
         ::IOP::ServiceId id
@@ -278,7 +279,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
+    // be\be_visitor_interface/interface_ch.cpp:210
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -304,17 +305,17 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   extern TAO_Export ::CORBA::TypeCode_ptr const _tc_RequestInfo;
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module PortableInterceptor
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:61
+// be\be_visitor_traits.cpp:61
 
 // Traits specializations.
 namespace TAO
@@ -343,14 +344,14 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::RequestInfo_ptr); // copying
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::RequestInfo_ptr *); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::RequestInfo_ptr &);
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:955
+// be\be_codegen.cpp:955
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/TAO/tao/ServerRequestInfoA.cpp b/TAO/tao/ServerRequestInfoA.cpp
index 330d5563081..b97a8646554 100644
--- a/TAO/tao/ServerRequestInfoA.cpp
+++ b/TAO/tao/ServerRequestInfoA.cpp
@@ -36,7 +36,7 @@
 #include "tao/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
+// be\be_visitor_typecode/objref_typecode.cpp:76
 
 static TAO::TypeCode::Objref<char const *,
                              TAO::Null_RefCount_Policy>
@@ -54,7 +54,7 @@ namespace PortableInterceptor
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// be\be_visitor_interface/any_op_cs.cpp:50
 
 namespace TAO
 {
diff --git a/TAO/tao/ServerRequestInfoC.cpp b/TAO/tao/ServerRequestInfoC.cpp
index 5a0669c22f0..eab818b9b7f 100644
--- a/TAO/tao/ServerRequestInfoC.cpp
+++ b/TAO/tao/ServerRequestInfoC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:291
+// be\be_codegen.cpp:291
 
 
 #include "ServerRequestInfoC.h"
@@ -39,7 +39,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
@@ -48,7 +48,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::ServerRequestInfo.
 
@@ -103,15 +103,9 @@ PortableInterceptor::ServerRequestInfo::_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ServerRequestInfo::_nil ();
-    }
-  
-  ServerRequestInfo_ptr proxy =
-    dynamic_cast<ServerRequestInfo_ptr> (_tao_objref);
-  
-  return ServerRequestInfo::_duplicate (proxy);
+  return ServerRequestInfo::_duplicate (
+      dynamic_cast<ServerRequestInfo_ptr> (_tao_objref)
+    );
 }
 
 PortableInterceptor::ServerRequestInfo_ptr
@@ -120,15 +114,9 @@ PortableInterceptor::ServerRequestInfo::_unchecked_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ServerRequestInfo::_nil ();
-    }
-  
-  ServerRequestInfo_ptr proxy =
-    dynamic_cast<ServerRequestInfo_ptr> (_tao_objref);
-  
-  return ServerRequestInfo::_duplicate (proxy);
+  return ServerRequestInfo::_duplicate (
+      dynamic_cast<ServerRequestInfo_ptr> (_tao_objref)
+    );
 }
 
 PortableInterceptor::ServerRequestInfo_ptr
diff --git a/TAO/tao/ServerRequestInfoC.h b/TAO/tao/ServerRequestInfoC.h
index 43ecdf8bb84..38b6259f83d 100644
--- a/TAO/tao/ServerRequestInfoC.h
+++ b/TAO/tao/ServerRequestInfoC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_SERVERREQUESTINFOC_H_
 #define _TAO_IDL_ORIG_SERVERREQUESTINFOC_H_
@@ -47,6 +47,7 @@
 #include "tao/Object.h"
 #include "tao/TypeCode_Constants.h"
 #include "tao/Any.h"
+#include "tao/TypeCode.h"
 #include "tao/Objref_VarOut_T.h"
 
 #include "tao/RequestInfoC.h"
@@ -68,13 +69,13 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace PortableInterceptor
 {
   
   // TAO_IDL - Generated from
-  // .\be\be_interface.cpp:598
+  // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_
@@ -97,7 +98,7 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_
@@ -132,7 +133,7 @@ namespace PortableInterceptor
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Any * sending_exception (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -142,7 +143,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual char * server_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -152,7 +153,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual char * orb_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -162,7 +163,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::PortableInterceptor::AdapterName * adapter_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -172,7 +173,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::PortableInterceptor::ObjectId * object_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -182,7 +183,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::CORBA::OctetSeq * adapter_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -192,7 +193,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual char * target_most_derived_interface (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -202,7 +203,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::CORBA::Policy_ptr get_server_policy (
         ::CORBA::PolicyType type
@@ -213,7 +214,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void set_slot (
         ::PortableInterceptor::SlotId id,
@@ -226,7 +227,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean target_is_a (
         const char * id
@@ -237,7 +238,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void add_reply_service_context (
         const ::IOP::ServiceContext & service_context,
@@ -249,7 +250,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
+    // be\be_visitor_interface/interface_ch.cpp:210
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -275,17 +276,17 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServerRequestInfo;
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module PortableInterceptor
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:61
+// be\be_visitor_traits.cpp:61
 
 // Traits specializations.
 namespace TAO
@@ -314,14 +315,14 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr); // copying
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr *); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr &);
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:955
+// be\be_codegen.cpp:955
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/TAO/tao/ServerRequestInterceptorC.cpp b/TAO/tao/ServerRequestInterceptorC.cpp
index 641919d9d98..82e30f3c415 100644
--- a/TAO/tao/ServerRequestInterceptorC.cpp
+++ b/TAO/tao/ServerRequestInterceptorC.cpp
@@ -39,7 +39,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
@@ -103,15 +103,9 @@ PortableInterceptor::ServerRequestInterceptor::_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ServerRequestInterceptor::_nil ();
-    }
-  
-  ServerRequestInterceptor_ptr proxy =
-    dynamic_cast<ServerRequestInterceptor_ptr> (_tao_objref);
-  
-  return ServerRequestInterceptor::_duplicate (proxy);
+  return ServerRequestInterceptor::_duplicate (
+      dynamic_cast<ServerRequestInterceptor_ptr> (_tao_objref)
+    );
 }
 
 PortableInterceptor::ServerRequestInterceptor_ptr
@@ -120,15 +114,9 @@ PortableInterceptor::ServerRequestInterceptor::_unchecked_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ServerRequestInterceptor::_nil ();
-    }
-  
-  ServerRequestInterceptor_ptr proxy =
-    dynamic_cast<ServerRequestInterceptor_ptr> (_tao_objref);
-  
-  return ServerRequestInterceptor::_duplicate (proxy);
+  return ServerRequestInterceptor::_duplicate (
+      dynamic_cast<ServerRequestInterceptor_ptr> (_tao_objref)
+    );
 }
 
 PortableInterceptor::ServerRequestInterceptor_ptr
diff --git a/TAO/tao/ServerRequestInterceptorC.h b/TAO/tao/ServerRequestInterceptorC.h
index 82367517fca..28a219ca5d6 100644
--- a/TAO/tao/ServerRequestInterceptorC.h
+++ b/TAO/tao/ServerRequestInterceptorC.h
@@ -70,22 +70,22 @@
 
 namespace PortableInterceptor
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_
-
+  
   class ServerRequestInfo;
   typedef ServerRequestInfo *ServerRequestInfo_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ServerRequestInfo
       >
     ServerRequestInfo_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ServerRequestInfo
@@ -93,22 +93,22 @@ namespace PortableInterceptor
     ServerRequestInfo_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_
-
+  
   class ServerRequestInterceptor;
   typedef ServerRequestInterceptor *ServerRequestInterceptor_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ServerRequestInterceptor
       >
     ServerRequestInterceptor_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ServerRequestInterceptor
@@ -116,45 +116,45 @@ namespace PortableInterceptor
     ServerRequestInterceptor_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR_CH_
-
+  
   class TAO_Export ServerRequestInterceptor
     : public virtual ::PortableInterceptor::Interceptor
   {
   public:
     typedef ServerRequestInterceptor_ptr _ptr_type;
     typedef ServerRequestInterceptor_var _var_type;
-
+    
     // The static operations.
     static ServerRequestInterceptor_ptr _duplicate (ServerRequestInterceptor_ptr obj);
-
+    
     static void _tao_release (ServerRequestInterceptor_ptr obj);
-
+    
     static ServerRequestInterceptor_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerRequestInterceptor_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerRequestInterceptor_ptr _nil (void)
     {
       return static_cast<ServerRequestInterceptor_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
 #if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
 
     virtual void tao_ft_interception_point (
@@ -168,10 +168,10 @@ namespace PortableInterceptor
       )) {}
 
 #endif /* TAO_HAS_EXTENDED_FT_INTERCEPTORS */
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void receive_request_service_contexts (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -180,10 +180,10 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void receive_request (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -192,10 +192,10 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void send_reply (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -203,10 +203,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void send_exception (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -215,10 +215,10 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void send_other (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -227,36 +227,36 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     ServerRequestInterceptor (void);
-
+    
     virtual ~ServerRequestInterceptor (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     ServerRequestInterceptor (const ServerRequestInterceptor &);
-
+    
     void operator= (const ServerRequestInterceptor &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServerRequestInterceptor;
 
 // TAO_IDL - Generated from
@@ -273,7 +273,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_
-
+  
   template<>
   struct TAO_Export Objref_Traits< ::PortableInterceptor::ServerRequestInfo>
   {
@@ -294,7 +294,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_
-
+  
   template<>
   struct TAO_Export Objref_Traits< ::PortableInterceptor::ServerRequestInterceptor>
   {
diff --git a/TAO/tao/ServicesA.cpp b/TAO/tao/ServicesA.cpp
index 31f6421fbdd..19e890423f4 100644
--- a/TAO/tao/ServicesA.cpp
+++ b/TAO/tao/ServicesA.cpp
@@ -32,12 +32,13 @@
 #include "tao/Sequence_TypeCode_Static.h"
 #include "tao/Struct_TypeCode_Static.h"
 #include "tao/TypeCode_Struct_Field.h"
+#include "tao/Recursive_Type_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -57,7 +58,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -77,7 +78,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -97,7 +98,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -117,12 +118,12 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_CORBA_ServiceOptionSeq_GUARD
@@ -146,6 +147,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_CORBA_ServiceOptionSeq_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -164,7 +166,12 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ServiceDetail[] =
   {
@@ -173,10 +180,9 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ServiceDetail (
     CORBA::tk_struct,
     "IDL:omg.org/CORBA/ServiceDetail:1.0",
@@ -193,12 +199,12 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_CORBA_ServiceDetailSeq_GUARD
@@ -222,6 +228,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_CORBA_ServiceDetailSeq_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -240,7 +247,17 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ServiceInformation[] =
   {
@@ -249,10 +266,9 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ServiceInformation (
     CORBA::tk_struct,
     "IDL:omg.org/CORBA/ServiceInformation:1.0",
@@ -269,7 +285,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
@@ -328,7 +344,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -386,7 +402,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
@@ -445,7 +461,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
diff --git a/TAO/tao/ServicesC.cpp b/TAO/tao/ServicesC.cpp
index 72cb425a180..839958233b4 100644
--- a/TAO/tao/ServicesC.cpp
+++ b/TAO/tao/ServicesC.cpp
@@ -38,7 +38,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/ShortSeqA.cpp b/TAO/tao/ShortSeqA.cpp
index 6d6b87aa1b3..82cd3336f0f 100644
--- a/TAO/tao/ShortSeqA.cpp
+++ b/TAO/tao/ShortSeqA.cpp
@@ -35,12 +35,12 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_CORBA_ShortSeq_GUARD
@@ -64,6 +64,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_CORBA_ShortSeq_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -82,7 +83,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
diff --git a/TAO/tao/ShortSeqC.cpp b/TAO/tao/ShortSeqC.cpp
index 71b2b05f73a..ef3a5aeb545 100644
--- a/TAO/tao/ShortSeqC.cpp
+++ b/TAO/tao/ShortSeqC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/StringSeqA.cpp b/TAO/tao/StringSeqA.cpp
index dc875624d23..625c670659c 100644
--- a/TAO/tao/StringSeqA.cpp
+++ b/TAO/tao/StringSeqA.cpp
@@ -36,12 +36,12 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_CORBA_StringSeq_GUARD
@@ -65,6 +65,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_CORBA_StringSeq_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -83,7 +84,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp
index c6e6dc6f6b7..4ee23832b66 100644
--- a/TAO/tao/StringSeqC.cpp
+++ b/TAO/tao/StringSeqC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/TAOA.cpp b/TAO/tao/TAOA.cpp
index 9af3c53c6db..fec81c09e9c 100644
--- a/TAO/tao/TAOA.cpp
+++ b/TAO/tao/TAOA.cpp
@@ -32,13 +32,14 @@
 #include "tao/Objref_TypeCode_Static.h"
 #include "tao/Struct_TypeCode_Static.h"
 #include "tao/TypeCode_Struct_Field.h"
+#include "tao/Recursive_Type_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -58,7 +59,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
+// be\be_visitor_typecode/struct_typecode.cpp:87
 
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_TAO_BufferingConstraint[] =
   {
@@ -69,10 +70,9 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
   _tao_tc_TAO_BufferingConstraint (
     CORBA::tk_struct,
     "IDL:tao/TAO/BufferingConstraint:1.0",
@@ -89,7 +89,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
+// be\be_visitor_typecode/objref_typecode.cpp:76
 
 static TAO::TypeCode::Objref<char const *,
                              TAO::Null_RefCount_Policy>
@@ -107,7 +107,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -165,7 +165,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// be\be_visitor_interface/any_op_cs.cpp:50
 
 namespace TAO
 {
diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp
index e8eccd0db16..72b89820afc 100644
--- a/TAO/tao/TAOC.cpp
+++ b/TAO/tao/TAOC.cpp
@@ -38,7 +38,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
@@ -115,15 +115,9 @@ TAO::BufferingConstraintPolicy::_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return BufferingConstraintPolicy::_nil ();
-    }
-  
-  BufferingConstraintPolicy_ptr proxy =
-    dynamic_cast<BufferingConstraintPolicy_ptr> (_tao_objref);
-  
-  return BufferingConstraintPolicy::_duplicate (proxy);
+  return BufferingConstraintPolicy::_duplicate (
+      dynamic_cast<BufferingConstraintPolicy_ptr> (_tao_objref)
+    );
 }
 
 TAO::BufferingConstraintPolicy_ptr
@@ -132,15 +126,9 @@ TAO::BufferingConstraintPolicy::_unchecked_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return BufferingConstraintPolicy::_nil ();
-    }
-  
-  BufferingConstraintPolicy_ptr proxy =
-    dynamic_cast<BufferingConstraintPolicy_ptr> (_tao_objref);
-  
-  return BufferingConstraintPolicy::_duplicate (proxy);
+  return BufferingConstraintPolicy::_duplicate (
+      dynamic_cast<BufferingConstraintPolicy_ptr> (_tao_objref)
+    );
 }
 
 TAO::BufferingConstraintPolicy_ptr
diff --git a/TAO/tao/TimeBaseA.cpp b/TAO/tao/TimeBaseA.cpp
index 9586e864fe1..93f2ddacf31 100644
--- a/TAO/tao/TimeBaseA.cpp
+++ b/TAO/tao/TimeBaseA.cpp
@@ -31,12 +31,13 @@
 #include "tao/Alias_TypeCode_Static.h"
 #include "tao/Struct_TypeCode_Static.h"
 #include "tao/TypeCode_Struct_Field.h"
+#include "tao/Recursive_Type_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -56,7 +57,7 @@ namespace TimeBase
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -76,7 +77,7 @@ namespace TimeBase
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -96,7 +97,7 @@ namespace TimeBase
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
+// be\be_visitor_typecode/struct_typecode.cpp:87
 
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_TimeBase_UtcT[] =
   {
@@ -107,10 +108,9 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
   _tao_tc_TimeBase_UtcT (
     CORBA::tk_struct,
     "IDL:omg.org/TimeBase/UtcT:1.0",
@@ -127,7 +127,7 @@ namespace TimeBase
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
+// be\be_visitor_typecode/struct_typecode.cpp:87
 
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_TimeBase_IntervalT[] =
   {
@@ -136,10 +136,9 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
   _tao_tc_TimeBase_IntervalT (
     CORBA::tk_struct,
     "IDL:omg.org/TimeBase/IntervalT:1.0",
@@ -156,7 +155,7 @@ namespace TimeBase
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -214,7 +213,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp
index 79fb5ffe580..aa5a1ecaaa7 100644
--- a/TAO/tao/TimeBaseC.cpp
+++ b/TAO/tao/TimeBaseC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/TypeCode.h b/TAO/tao/TypeCode.h
index 4f27232bcd5..373104e4ca6 100644
--- a/TAO/tao/TypeCode.h
+++ b/TAO/tao/TypeCode.h
@@ -522,7 +522,7 @@ namespace TAO
     /**
      * @see @CORBA::TypeCode::tao_marshal() description for details.
      */
-    
+
     TAO_Export bool marshal (TAO_OutputCDR & cdr,
                              CORBA::TypeCode_ptr tc,
                              CORBA::ULong offset);
diff --git a/TAO/tao/Typecode_typesC.cpp b/TAO/tao/Typecode_typesC.cpp
index a924b9f021a..bff34272a23 100644
--- a/TAO/tao/Typecode_typesC.cpp
+++ b/TAO/tao/Typecode_typesC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/Typecode_typesC.h b/TAO/tao/Typecode_typesC.h
index 5ca14029cdd..80c0d60f0dc 100644
--- a/TAO/tao/Typecode_typesC.h
+++ b/TAO/tao/Typecode_typesC.h
@@ -64,13 +64,13 @@
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
   // TAO_IDL - Generated from
   // be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum TCKind
   {
     tk_null,
@@ -116,7 +116,7 @@ namespace CORBA
     // just be table lookups.  It must always be the last enum value!!
     , TAO_TC_KIND_COUNT
   };
-  
+
   typedef TCKind &TCKind_out;
 
 // TAO_IDL - Generated from
@@ -127,10 +127,6 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be\be_visitor_traits.cpp:61
 
-// Traits specializations.
-namespace TAO
-{
-}
 
 // TAO_IDL - Generated from
 // be\be_visitor_enum/cdr_op_ch.cpp:50
diff --git a/TAO/tao/ULongLongSeqA.cpp b/TAO/tao/ULongLongSeqA.cpp
index ae0aa44533d..2144f0d1b09 100644
--- a/TAO/tao/ULongLongSeqA.cpp
+++ b/TAO/tao/ULongLongSeqA.cpp
@@ -35,12 +35,12 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_CORBA_ULongLongSeq_GUARD
@@ -64,6 +64,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_CORBA_ULongLongSeq_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -82,7 +83,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
diff --git a/TAO/tao/ULongLongSeqC.cpp b/TAO/tao/ULongLongSeqC.cpp
index 4ce340c1cdb..6d9deb8b3e6 100644
--- a/TAO/tao/ULongLongSeqC.cpp
+++ b/TAO/tao/ULongLongSeqC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/ULongSeqA.cpp b/TAO/tao/ULongSeqA.cpp
index 7ceac7bfd8f..e3b8a0b711f 100644
--- a/TAO/tao/ULongSeqA.cpp
+++ b/TAO/tao/ULongSeqA.cpp
@@ -35,12 +35,12 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_CORBA_ULongSeq_GUARD
@@ -64,6 +64,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_CORBA_ULongSeq_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -82,7 +83,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
diff --git a/TAO/tao/ULongSeqC.cpp b/TAO/tao/ULongSeqC.cpp
index 989c3d1deef..76df5c16bb5 100644
--- a/TAO/tao/ULongSeqC.cpp
+++ b/TAO/tao/ULongSeqC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/UShortSeqA.cpp b/TAO/tao/UShortSeqA.cpp
index 98a36bb9e5a..6259a96e1f9 100644
--- a/TAO/tao/UShortSeqA.cpp
+++ b/TAO/tao/UShortSeqA.cpp
@@ -35,12 +35,12 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_CORBA_UShortSeq_GUARD
@@ -64,6 +64,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_CORBA_UShortSeq_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -82,7 +83,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
diff --git a/TAO/tao/UShortSeqC.cpp b/TAO/tao/UShortSeqC.cpp
index 1f25cad14f7..178d8264a70 100644
--- a/TAO/tao/UShortSeqC.cpp
+++ b/TAO/tao/UShortSeqC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/ValueModifierC.cpp b/TAO/tao/ValueModifierC.cpp
index 5dc8ed0dcdc..76644c8b3c0 100644
--- a/TAO/tao/ValueModifierC.cpp
+++ b/TAO/tao/ValueModifierC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/VisibilityA.cpp b/TAO/tao/VisibilityA.cpp
index 63a9d551f37..35d0305d1fb 100644
--- a/TAO/tao/VisibilityA.cpp
+++ b/TAO/tao/VisibilityA.cpp
@@ -33,7 +33,7 @@
 #include "tao/Any.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
diff --git a/TAO/tao/VisibilityC.cpp b/TAO/tao/VisibilityC.cpp
index dbc285bb6af..76f74d94f2f 100644
--- a/TAO/tao/VisibilityC.cpp
+++ b/TAO/tao/VisibilityC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/WCharSeqA.cpp b/TAO/tao/WCharSeqA.cpp
index a1ecbfe3f50..5f79ab8d2bf 100644
--- a/TAO/tao/WCharSeqA.cpp
+++ b/TAO/tao/WCharSeqA.cpp
@@ -35,12 +35,12 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_CORBA_WCharSeq_GUARD
@@ -64,6 +64,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_CORBA_WCharSeq_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -82,7 +83,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
diff --git a/TAO/tao/WCharSeqC.cpp b/TAO/tao/WCharSeqC.cpp
index 38d56e0a3ca..7be0ffd9c3d 100644
--- a/TAO/tao/WCharSeqC.cpp
+++ b/TAO/tao/WCharSeqC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/WStringSeqA.cpp b/TAO/tao/WStringSeqA.cpp
index 4d8c289ee87..319557ee39c 100644
--- a/TAO/tao/WStringSeqA.cpp
+++ b/TAO/tao/WStringSeqA.cpp
@@ -36,12 +36,12 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
+// be\be_visitor_typecode/typecode_defn.cpp:937
 
 
 #ifndef _TAO_TYPECODE_CORBA_WStringSeq_GUARD
@@ -65,6 +65,7 @@ namespace TAO
 
 
 #endif /* _TAO_TYPECODE_CORBA_WStringSeq_GUARD */
+
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
                             TAO::Null_RefCount_Policy>
@@ -83,7 +84,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 // Copying insertion.
diff --git a/TAO/tao/WStringSeqC.cpp b/TAO/tao/WStringSeqC.cpp
index 81af095c52b..fd19f744d9f 100644
--- a/TAO/tao/WStringSeqC.cpp
+++ b/TAO/tao/WStringSeqC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/WrongTransactionA.cpp b/TAO/tao/WrongTransactionA.cpp
index 8f91a007042..83780fd5442 100644
--- a/TAO/tao/WrongTransactionA.cpp
+++ b/TAO/tao/WrongTransactionA.cpp
@@ -36,14 +36,13 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
+// be\be_visitor_typecode/struct_typecode.cpp:87
 
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_CORBA_WrongTransaction = 0;
 static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_WrongTransaction (
     CORBA::tk_except,
     "IDL:omg.org/CORBA/WrongTransaction:1.0",
@@ -60,7 +59,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
+// be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
 {
diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp
index 4cce935470c..97721c038ef 100644
--- a/TAO/tao/WrongTransactionC.cpp
+++ b/TAO/tao/WrongTransactionC.cpp
@@ -39,7 +39,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h
index b07be6725c3..e17d3e6099d 100644
--- a/TAO/tao/WrongTransactionC.h
+++ b/TAO/tao/WrongTransactionC.h
@@ -65,7 +65,7 @@ namespace CORBA
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:51
+  // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_CORBA_WRONGTRANSACTION_CH_)
 #define _CORBA_WRONGTRANSACTION_CH_
@@ -102,7 +102,7 @@ namespace CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:127
+    // be\be_visitor_exception/exception_ch.cpp:129
     
     virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
diff --git a/TAO/tao/orb_typesA.cpp b/TAO/tao/orb_typesA.cpp
index a4f7d9d600d..e666094eee2 100644
--- a/TAO/tao/orb_typesA.cpp
+++ b/TAO/tao/orb_typesA.cpp
@@ -34,7 +34,7 @@
 #include "tao/Any.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -54,7 +54,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -74,7 +74,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
@@ -94,7 +94,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
 static TAO::TypeCode::Alias<char const *,
                             CORBA::TypeCode_ptr const *,
diff --git a/TAO/tao/orb_typesC.cpp b/TAO/tao/orb_typesC.cpp
index 526c4eae23c..c1fcdeef192 100644
--- a/TAO/tao/orb_typesC.cpp
+++ b/TAO/tao/orb_typesC.cpp
@@ -37,7 +37,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO