116 files changed, 24820 insertions, 28187 deletions

diff --git a/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.cpp b/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.cpp
index 03a5cf38e31..227549eb3b9 100644
--- a/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.cpp
@@ -23,26 +23,26 @@ TAO_AbstractInterfaceDef_i::~TAO_AbstractInterfaceDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_AbstractInterfaceDef_i::def_kind (CORBA::Environment &)
+TAO_AbstractInterfaceDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_AbstractInterface;
 }
 
-CORBA::Boolean 
-TAO_AbstractInterfaceDef_i::is_a (const char *interface_id,
-                                  CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_AbstractInterfaceDef_i::is_a (const char *interface_id
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->is_a_i (interface_id,
-                       ACE_TRY_ENV);
+  return this->is_a_i (interface_id
+                       TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA::Boolean 
-TAO_AbstractInterfaceDef_i::is_a_i (const char *interface_id,
-                                    CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_AbstractInterfaceDef_i::is_a_i (const char *interface_id
+                                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (interface_id, "IDL:omg.org/CORBA/AbstractBase:1.0") == 0)
@@ -50,7 +50,7 @@ TAO_AbstractInterfaceDef_i::is_a_i (const char *interface_id,
       return 1;
     }
 
-  return this->TAO_InterfaceDef_i::is_a_i (interface_id,
-                                           ACE_TRY_ENV);
+  return this->TAO_InterfaceDef_i::is_a_i (interface_id
+                                           TAO_ENV_ARG_PARAMETER);
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.h b/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.h
index 656adb944c4..7bcb10f68c4 100644
--- a/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.h
@@ -47,27 +47,24 @@ public:
   // Constructor
 
   virtual ~TAO_AbstractInterfaceDef_i (void);
-  // Destructor  
+  // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA::Boolean is_a (
-      const char *interface_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *interface_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
-      const char *interface_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *interface_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/AliasDef_i.cpp b/TAO/orbsvcs/IFR_Service/AliasDef_i.cpp
index d8e2c4f0cb0..555df7e18e5 100644
--- a/TAO/orbsvcs/IFR_Service/AliasDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/AliasDef_i.cpp
@@ -22,23 +22,23 @@ TAO_AliasDef_i::~TAO_AliasDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_AliasDef_i::def_kind (CORBA::Environment &)
+TAO_AliasDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Alias;
 }
 
-CORBA::TypeCode_ptr 
-TAO_AliasDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_AliasDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_AliasDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_AliasDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -63,32 +63,32 @@ TAO_AliasDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
                                        0);
 
   TAO_IDLType_i *impl =
-    this->repo_->servant_factory ()->create_idltype (ot_key,
-                                                     ACE_TRY_ENV);
+    this->repo_->servant_factory ()->create_idltype (ot_key
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   auto_ptr<TAO_IDLType_i> safety (impl);
 
-  CORBA::TypeCode_var tc = impl->type_i (ACE_TRY_ENV);
+  CORBA::TypeCode_var tc = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return this->repo_->tc_factory ()->create_alias_tc (id.c_str (),
                                                       name.c_str (),
-                                                      tc.in (),
-                                                      ACE_TRY_ENV);
+                                                      tc.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA_IDLType_ptr 
-TAO_AliasDef_i::original_type_def (CORBA::Environment &ACE_TRY_ENV)
+CORBA_IDLType_ptr
+TAO_AliasDef_i::original_type_def (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ());
 
-  return this->original_type_def_i (ACE_TRY_ENV);
+  return this->original_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_IDLType_ptr 
-TAO_AliasDef_i::original_type_def_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA_IDLType_ptr
+TAO_AliasDef_i::original_type_def_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString original_type;
@@ -107,38 +107,38 @@ TAO_AliasDef_i::original_type_def_i (CORBA::Environment &ACE_TRY_ENV)
                                              "def_kind",
                                              kind);
 
-  CORBA::DefinitionKind def_kind = 
+  CORBA::DefinitionKind def_kind =
     ACE_static_cast (CORBA::DefinitionKind, kind);
 
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (def_kind,
-                                                    original_type.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    original_type.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
 
-  return CORBA_IDLType::_narrow (obj.in (),
-                                 ACE_TRY_ENV);
+  return CORBA_IDLType::_narrow (obj.in ()
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_AliasDef_i::original_type_def (CORBA_IDLType_ptr original_type_def,
-                                   CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_AliasDef_i::original_type_def (CORBA_IDLType_ptr original_type_def
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->original_type_def_i (original_type_def,
-                             ACE_TRY_ENV);
+  this->original_type_def_i (original_type_def
+                             TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_AliasDef_i::original_type_def_i (CORBA_IDLType_ptr original_type_def,
-                                     CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_AliasDef_i::original_type_def_i (CORBA_IDLType_ptr original_type_def
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var oid =
-    this->repo_->ir_poa ()->reference_to_id (original_type_def,
-                                             ACE_TRY_ENV);
+    this->repo_->ir_poa ()->reference_to_id (original_type_def
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var original_type =
diff --git a/TAO/orbsvcs/IFR_Service/AliasDef_i.h b/TAO/orbsvcs/IFR_Service/AliasDef_i.h
index f9d52134765..e2d6535f5c1 100644
--- a/TAO/orbsvcs/IFR_Service/AliasDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/AliasDef_i.h
@@ -51,50 +51,43 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA_IDLType_ptr original_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_IDLType_ptr original_type_def_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void original_type_def (
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void original_type_def_i (
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/ArrayDef_i.cpp b/TAO/orbsvcs/IFR_Service/ArrayDef_i.cpp
index a3a7033e013..95dbe76c837 100644
--- a/TAO/orbsvcs/IFR_Service/ArrayDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ArrayDef_i.cpp
@@ -20,27 +20,27 @@ TAO_ArrayDef_i::~TAO_ArrayDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ArrayDef_i::def_kind (CORBA::Environment &)
+TAO_ArrayDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Array;
 }
 
-void 
-TAO_ArrayDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ArrayDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_ArrayDef_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ArrayDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Only if it is (w)string, fixed, array or sequence.
-  this->destroy_element_type (ACE_TRY_ENV);
+  this->destroy_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_TString name;
@@ -53,44 +53,44 @@ TAO_ArrayDef_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
                                           0);
 }
 
-CORBA::TypeCode_ptr 
-TAO_ArrayDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_ArrayDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_ArrayDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_ArrayDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::TypeCode_var element_typecode =
-    this->element_type_i (ACE_TRY_ENV);
+    this->element_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
-  CORBA::ULong length = this->length_i (ACE_TRY_ENV);
+  CORBA::ULong length = this->length_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return this->repo_->tc_factory ()->create_array_tc (
                                          length,
-                                         element_typecode.in (),
-                                         ACE_TRY_ENV
+                                         element_typecode.in ()
+                                         TAO_ENV_ARG_PARAMETER
                                        );
 }
 
-CORBA::ULong 
-TAO_ArrayDef_i::length (CORBA::Environment &ACE_TRY_ENV)
+CORBA::ULong
+TAO_ArrayDef_i::length (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->length_i (ACE_TRY_ENV);
+  return this->length_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::ULong 
-TAO_ArrayDef_i::length_i (CORBA::Environment &)
+CORBA::ULong
+TAO_ArrayDef_i::length_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int length = 0;
@@ -101,20 +101,20 @@ TAO_ArrayDef_i::length_i (CORBA::Environment &)
   return ACE_static_cast (CORBA::ULong, length);
 }
 
-void 
-TAO_ArrayDef_i::length (CORBA::ULong length,
-                        CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ArrayDef_i::length (CORBA::ULong length
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->length_i (length,
-                  ACE_TRY_ENV);
+  this->length_i (length
+                  TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_ArrayDef_i::length_i (CORBA::ULong length,
-                          CORBA::Environment &)
+void
+TAO_ArrayDef_i::length_i (CORBA::ULong length
+                          TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
@@ -122,17 +122,17 @@ TAO_ArrayDef_i::length_i (CORBA::ULong length,
                                              length);
 }
 
-CORBA::TypeCode_ptr 
-TAO_ArrayDef_i::element_type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_ArrayDef_i::element_type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->element_type_i (ACE_TRY_ENV);
+  return this->element_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_ArrayDef_i::element_type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_ArrayDef_i::element_type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString element_path;
@@ -147,26 +147,26 @@ TAO_ArrayDef_i::element_type_i (CORBA::Environment &ACE_TRY_ENV)
                                        0);
 
   TAO_IDLType_i *impl =
-    this->repo_->servant_factory ()->create_idltype (element_key,
-                                                     ACE_TRY_ENV);
+    this->repo_->servant_factory ()->create_idltype (element_key
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   auto_ptr<TAO_IDLType_i> safety (impl);
 
-  return impl->type_i (ACE_TRY_ENV);
+  return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_IDLType_ptr 
-TAO_ArrayDef_i::element_type_def (CORBA::Environment &ACE_TRY_ENV)
+CORBA_IDLType_ptr
+TAO_ArrayDef_i::element_type_def (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ());
 
-  return this->element_type_def_i (ACE_TRY_ENV);
+  return this->element_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_IDLType_ptr 
-TAO_ArrayDef_i::element_type_def_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA_IDLType_ptr
+TAO_ArrayDef_i::element_type_def_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString element_path;
@@ -185,41 +185,41 @@ TAO_ArrayDef_i::element_type_def_i (CORBA::Environment &ACE_TRY_ENV)
                                              "def_kind",
                                              kind);
 
-  CORBA::DefinitionKind def_kind = 
+  CORBA::DefinitionKind def_kind =
     ACE_static_cast (CORBA::DefinitionKind, kind);
 
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (def_kind,
-                                                    element_path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    element_path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
 
-  return CORBA_IDLType::_narrow (obj.in (),
-                                 ACE_TRY_ENV);
+  return CORBA_IDLType::_narrow (obj.in ()
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_ArrayDef_i::element_type_def (CORBA_IDLType_ptr element_type_def,
-                                  CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ArrayDef_i::element_type_def (CORBA_IDLType_ptr element_type_def
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->element_type_def_i (element_type_def,
-                            ACE_TRY_ENV);
+  this->element_type_def_i (element_type_def
+                            TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_ArrayDef_i::element_type_def_i (CORBA_IDLType_ptr element_type_def,
-                                    CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ArrayDef_i::element_type_def_i (CORBA_IDLType_ptr element_type_def
+                                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->destroy_element_type (ACE_TRY_ENV);
+  this->destroy_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var oid =
-    this->repo_->ir_poa ()->reference_to_id (element_type_def,
-                                             ACE_TRY_ENV);
+    this->repo_->ir_poa ()->reference_to_id (element_type_def
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var new_element_path =
@@ -230,9 +230,9 @@ TAO_ArrayDef_i::element_type_def_i (CORBA_IDLType_ptr element_type_def,
                                             new_element_path.in ());
 }
 
-void 
+void
 TAO_ArrayDef_i::destroy_element_type (
-      CORBA::Environment &ACE_TRY_ENV)
+      TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString element_path;
@@ -266,13 +266,13 @@ TAO_ArrayDef_i::destroy_element_type (
     case CORBA::dk_Sequence:
     {
       TAO_IDLType_i *impl =
-        this->repo_->servant_factory ()->create_idltype (element_key,
-                                                         ACE_TRY_ENV);
+        this->repo_->servant_factory ()->create_idltype (element_key
+                                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       auto_ptr<TAO_IDLType_i> safety (impl);
 
-      impl->destroy_i (ACE_TRY_ENV);
+      impl->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       break;
     }
diff --git a/TAO/orbsvcs/IFR_Service/ArrayDef_i.h b/TAO/orbsvcs/IFR_Service/ArrayDef_i.h
index 0aa8dbbb355..829ad7154db 100644
--- a/TAO/orbsvcs/IFR_Service/ArrayDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/ArrayDef_i.h
@@ -50,106 +50,90 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ULong length (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ULong length_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void length (
-      CORBA::ULong length,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong length
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void length_i (
-      CORBA::ULong length,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong length
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr element_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr element_type_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_IDLType_ptr element_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_IDLType_ptr element_type_def_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void element_type_def (
-      CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void element_type_def_i (
-      CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   void destroy_element_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroys an anonymous non-primitive element type.
 };
diff --git a/TAO/orbsvcs/IFR_Service/AttributeDef_i.cpp b/TAO/orbsvcs/IFR_Service/AttributeDef_i.cpp
index 790b8a069a5..fb94c9430cd 100644
--- a/TAO/orbsvcs/IFR_Service/AttributeDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/AttributeDef_i.cpp
@@ -24,23 +24,23 @@ TAO_AttributeDef_i::~TAO_AttributeDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_AttributeDef_i::def_kind (CORBA::Environment &)
+TAO_AttributeDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Attribute;
 }
 
 CORBA_Contained::Description *
-TAO_AttributeDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_AttributeDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_AttributeDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_AttributeDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_Contained::Description *desc_ptr = 0;
@@ -51,26 +51,26 @@ TAO_AttributeDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
 
   CORBA_Contained::Description_var retval = desc_ptr;
 
-  retval->kind = this->def_kind (ACE_TRY_ENV);
+  retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  retval->value <<= this->make_description (ACE_TRY_ENV);
+  retval->value <<= this->make_description (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return retval._retn ();
 }
 
-CORBA::TypeCode_ptr 
-TAO_AttributeDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_AttributeDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_AttributeDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_AttributeDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString type_path;
@@ -85,26 +85,26 @@ TAO_AttributeDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
                                        0);
 
   TAO_IDLType_i *impl =
-    this->repo_->servant_factory ()->create_idltype (type_key,
-                                                     ACE_TRY_ENV);
+    this->repo_->servant_factory ()->create_idltype (type_key
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   auto_ptr<TAO_IDLType_i> safety (impl);
 
-  return impl->type_i (ACE_TRY_ENV);
+  return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_IDLType_ptr 
-TAO_AttributeDef_i::type_def (CORBA::Environment &ACE_TRY_ENV)
+CORBA_IDLType_ptr
+TAO_AttributeDef_i::type_def (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ());
 
-  return this->type_def_i (ACE_TRY_ENV);
+  return this->type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_IDLType_ptr 
-TAO_AttributeDef_i::type_def_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA_IDLType_ptr
+TAO_AttributeDef_i::type_def_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString type_path;
@@ -128,36 +128,36 @@ TAO_AttributeDef_i::type_def_i (CORBA::Environment &ACE_TRY_ENV)
 
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (def_kind,
-                                                    type_path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    type_path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
 
-  CORBA_IDLType_var retval = CORBA_IDLType::_narrow (obj.in (),
-                                                     ACE_TRY_ENV);
+  CORBA_IDLType_var retval = CORBA_IDLType::_narrow (obj.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
 
   return retval._retn ();
 }
 
-void 
-TAO_AttributeDef_i::type_def (CORBA_IDLType_ptr type_def,
-                              CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_AttributeDef_i::type_def (CORBA_IDLType_ptr type_def
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->type_def_i (type_def,
-                    ACE_TRY_ENV);
+  this->type_def_i (type_def
+                    TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_AttributeDef_i::type_def_i (CORBA_IDLType_ptr type_def,
-                                CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_AttributeDef_i::type_def_i (CORBA_IDLType_ptr type_def
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::ObjectId_var oid = 
-    this->repo_->ir_poa ()->reference_to_id (type_def,
-                                             ACE_TRY_ENV);
+  PortableServer::ObjectId_var oid =
+    this->repo_->ir_poa ()->reference_to_id (type_def
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var type_path =
@@ -168,17 +168,17 @@ TAO_AttributeDef_i::type_def_i (CORBA_IDLType_ptr type_def,
                                             type_path.in ());
 }
 
-CORBA::AttributeMode 
-TAO_AttributeDef_i::mode (CORBA::Environment &ACE_TRY_ENV)
+CORBA::AttributeMode
+TAO_AttributeDef_i::mode (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::ATTR_NORMAL);
 
-  return this->mode_i (ACE_TRY_ENV);
+  return this->mode_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::AttributeMode 
-TAO_AttributeDef_i::mode_i (CORBA::Environment &)
+CORBA::AttributeMode
+TAO_AttributeDef_i::mode_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int mode = 0;
@@ -189,20 +189,20 @@ TAO_AttributeDef_i::mode_i (CORBA::Environment &)
   return ACE_static_cast (CORBA::AttributeMode, mode);
 }
 
-void 
-TAO_AttributeDef_i::mode (CORBA::AttributeMode mode,
-                          CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_AttributeDef_i::mode (CORBA::AttributeMode mode
+                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->mode_i (mode,
-                ACE_TRY_ENV);
+  this->mode_i (mode
+                TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_AttributeDef_i::mode_i (CORBA::AttributeMode mode,
-                            CORBA::Environment &)
+void
+TAO_AttributeDef_i::mode_i (CORBA::AttributeMode mode
+                            TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
@@ -211,15 +211,15 @@ TAO_AttributeDef_i::mode_i (CORBA::AttributeMode mode,
 }
 
 CORBA_AttributeDescription
-TAO_AttributeDef_i::make_description (CORBA::Environment &ACE_TRY_ENV)
+TAO_AttributeDef_i::make_description (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_AttributeDescription ad;
 
-  ad.name = this->name_i (ACE_TRY_ENV);
+  ad.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (ad);
 
-  ad.id = this->id_i (ACE_TRY_ENV);
+  ad.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (ad);
 
   ACE_TString container_id;
@@ -230,13 +230,13 @@ TAO_AttributeDef_i::make_description (CORBA::Environment &ACE_TRY_ENV)
 
   ad.defined_in = container_id.c_str ();
 
-  ad.version = this->version_i (ACE_TRY_ENV);
+  ad.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (ad);
 
-  ad.type = this->type_i (ACE_TRY_ENV);
+  ad.type = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (ad);
 
-  ad.mode = this->mode_i (ACE_TRY_ENV);
+  ad.mode = this->mode_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (ad);
 /*
   ACE_Unbounded_Queue<ACE_Configuration_Section_Key> key_queue;
@@ -321,7 +321,7 @@ TAO_AttributeDef_i::make_description (CORBA::Environment &ACE_TRY_ENV)
       TAO_ExceptionDef_i impl (this->repo_,
                                key);
 
-      get_ed.type = impl.type_i (ACE_TRY_ENV);
+      get_ed.type = impl.type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (ad);
 
       get_ed_seq[i] = get_ed;
@@ -405,7 +405,7 @@ TAO_AttributeDef_i::make_description (CORBA::Environment &ACE_TRY_ENV)
       TAO_ExceptionDef_i impl (this->repo_,
                                key);
 
-      put_ed.type = impl.type_i (ACE_TRY_ENV);
+      put_ed.type = impl.type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (ad);
 
       put_ed_seq[i] = put_ed;
@@ -417,7 +417,7 @@ TAO_AttributeDef_i::make_description (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA_ExceptionDefSeq *
-TAO_AttributeDef_i::get_exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_AttributeDef_i::get_exceptions (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<ACE_TString> path_queue;
@@ -479,14 +479,14 @@ TAO_AttributeDef_i::get_exceptions (CORBA::Environment &ACE_TRY_ENV)
       ACE_TString path;
       path_queue.dequeue_head (path);
 
-      CORBA::Object_var obj = 
+      CORBA::Object_var obj =
         this->repo_->servant_factory ()->create_objref (CORBA::dk_Exception,
-                                                        path.c_str (),
-                                                        ACE_TRY_ENV);
+                                                        path.c_str ()
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      retval[i] = CORBA_ExceptionDef::_narrow (obj.in (),
-                                               ACE_TRY_ENV);
+      retval[i] = CORBA_ExceptionDef::_narrow (obj.in ()
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -494,7 +494,7 @@ TAO_AttributeDef_i::get_exceptions (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA_ExceptionDefSeq *
-TAO_AttributeDef_i::put_exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_AttributeDef_i::put_exceptions (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<ACE_TString> path_queue;
@@ -556,14 +556,14 @@ TAO_AttributeDef_i::put_exceptions (CORBA::Environment &ACE_TRY_ENV)
       ACE_TString path;
       path_queue.dequeue_head (path);
 
-      CORBA::Object_var obj = 
+      CORBA::Object_var obj =
         this->repo_->servant_factory ()->create_objref (CORBA::dk_Exception,
-                                                        path.c_str (),
-                                                        ACE_TRY_ENV);
+                                                        path.c_str ()
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      retval[i] = CORBA_ExceptionDef::_narrow (obj.in (),
-                                               ACE_TRY_ENV);
+      retval[i] = CORBA_ExceptionDef::_narrow (obj.in ()
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
diff --git a/TAO/orbsvcs/IFR_Service/AttributeDef_i.h b/TAO/orbsvcs/IFR_Service/AttributeDef_i.h
index f34ec5f7a98..e0257965c6d 100644
--- a/TAO/orbsvcs/IFR_Service/AttributeDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/AttributeDef_i.h
@@ -51,109 +51,93 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_IDLType_ptr type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_IDLType_ptr type_def_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void type_def (
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void type_def_i (
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::AttributeMode mode (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::AttributeMode mode_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void mode (
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void mode_i (
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_AttributeDescription make_description (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Common code for InterfaceDef to call in
   // making its own description.
 
   // These two are called by Contained::move().
   CORBA_ExceptionDefSeq *get_exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ExceptionDefSeq *put_exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/ComponentDef_i.cpp b/TAO/orbsvcs/IFR_Service/ComponentDef_i.cpp
index e6e97682214..58ea7753775 100644
--- a/TAO/orbsvcs/IFR_Service/ComponentDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ComponentDef_i.cpp
@@ -23,56 +23,56 @@ TAO_ComponentDef_i::~TAO_ComponentDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ComponentDef_i::def_kind (CORBA::Environment &)
+TAO_ComponentDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Component;
 }
 
-void 
-TAO_ComponentDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ComponentDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_ComponentDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_ComponentDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_ComponentDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_ComponentDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_ComponentDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ComponentDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-CORBA::TypeCode_ptr 
-TAO_ComponentDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_ComponentDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_ComponentDef_i::type_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA::TypeCode_ptr
+TAO_ComponentDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -80,56 +80,56 @@ TAO_ComponentDef_i::type_i (CORBA::Environment & /* ACE_TRY_ENV */)
 }
 
 CORBA_InterfaceDefSeq *
-TAO_ComponentDef_i::supported_interfaces (CORBA::Environment &ACE_TRY_ENV)
+TAO_ComponentDef_i::supported_interfaces (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->supported_interfaces_i (ACE_TRY_ENV);
+  return this->supported_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_InterfaceDefSeq *
-TAO_ComponentDef_i::supported_interfaces_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ComponentDef_i::supported_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-void 
+void
 TAO_ComponentDef_i::supported_interfaces (
-    const CORBA_InterfaceDefSeq &supported_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq &supported_interfaces
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->supported_interfaces_i (supported_interfaces,
-                                ACE_TRY_ENV);
+  this->supported_interfaces_i (supported_interfaces
+                                TAO_ENV_ARG_PARAMETER);
 }
 
-void 
+void
 TAO_ComponentDef_i::supported_interfaces_i (
-    const CORBA_InterfaceDefSeq & /* supported_interfaces */,
-    CORBA::Environment & /* ACE_TRY_ENV */
+    const CORBA_InterfaceDefSeq & /* supported_interfaces */
+    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
-IR::ComponentDef_ptr 
-TAO_ComponentDef_i::base_component (CORBA::Environment &ACE_TRY_ENV)
+IR::ComponentDef_ptr
+TAO_ComponentDef_i::base_component (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (IR::ComponentDef::_nil ());
 
-  return this->base_component_i (ACE_TRY_ENV);
+  return this->base_component_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-IR::ComponentDef_ptr 
-TAO_ComponentDef_i::base_component_i (CORBA::Environment & /* ACE_TRY_ENV */)
+IR::ComponentDef_ptr
+TAO_ComponentDef_i::base_component_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -137,16 +137,16 @@ TAO_ComponentDef_i::base_component_i (CORBA::Environment & /* ACE_TRY_ENV */)
 }
 
 IR::ProvidesDefSeq *
-TAO_ComponentDef_i::provides_interfaces (CORBA::Environment &ACE_TRY_ENV)
+TAO_ComponentDef_i::provides_interfaces (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->provides_interfaces_i (ACE_TRY_ENV);
+  return this->provides_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 IR::ProvidesDefSeq *
-TAO_ComponentDef_i::provides_interfaces_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ComponentDef_i::provides_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -154,16 +154,16 @@ TAO_ComponentDef_i::provides_interfaces_i (CORBA::Environment & /* ACE_TRY_ENV *
 }
 
 IR::UsesDefSeq *
-TAO_ComponentDef_i::uses_interfaces (CORBA::Environment &ACE_TRY_ENV)
+TAO_ComponentDef_i::uses_interfaces (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->uses_interfaces_i (ACE_TRY_ENV);
+  return this->uses_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 IR::UsesDefSeq *
-TAO_ComponentDef_i::uses_interfaces_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ComponentDef_i::uses_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -171,16 +171,16 @@ TAO_ComponentDef_i::uses_interfaces_i (CORBA::Environment & /* ACE_TRY_ENV */)
 }
 
 IR::EmitsDefSeq *
-TAO_ComponentDef_i::emits_events (CORBA::Environment &ACE_TRY_ENV)
+TAO_ComponentDef_i::emits_events (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->emits_events_i (ACE_TRY_ENV);
+  return this->emits_events_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 IR::EmitsDefSeq *
-TAO_ComponentDef_i::emits_events_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ComponentDef_i::emits_events_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -188,16 +188,16 @@ TAO_ComponentDef_i::emits_events_i (CORBA::Environment & /* ACE_TRY_ENV */)
 }
 
 IR::PublishesDefSeq *
-TAO_ComponentDef_i::publishes_events (CORBA::Environment &ACE_TRY_ENV)
+TAO_ComponentDef_i::publishes_events (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->publishes_events_i (ACE_TRY_ENV);
+  return this->publishes_events_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 IR::PublishesDefSeq *
-TAO_ComponentDef_i::publishes_events_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ComponentDef_i::publishes_events_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -205,37 +205,37 @@ TAO_ComponentDef_i::publishes_events_i (CORBA::Environment & /* ACE_TRY_ENV */)
 }
 
 IR::ConsumesDefSeq *
-TAO_ComponentDef_i::consumes_events (CORBA::Environment &ACE_TRY_ENV)
+TAO_ComponentDef_i::consumes_events (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->consumes_events_i (ACE_TRY_ENV);
+  return this->consumes_events_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 IR::ConsumesDefSeq *
-TAO_ComponentDef_i::consumes_events_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ComponentDef_i::consumes_events_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-CORBA::Boolean 
-TAO_ComponentDef_i::is_basic (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA::Boolean
+TAO_ComponentDef_i::is_basic (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-IR::ProvidesDef_ptr 
+IR::ProvidesDef_ptr
 TAO_ComponentDef_i::create_provides (
     const char *id,
     const char *name,
     const char *version,
-    CORBA_InterfaceDef_ptr interface_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_InterfaceDef_ptr interface_type
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -244,17 +244,17 @@ TAO_ComponentDef_i::create_provides (
   return this->create_provides_i (id,
                                   name,
                                   version,
-                                  interface_type,
-                                  ACE_TRY_ENV);
+                                  interface_type
+                                  TAO_ENV_ARG_PARAMETER);
 }
 
-IR::ProvidesDef_ptr 
+IR::ProvidesDef_ptr
 TAO_ComponentDef_i::create_provides_i (
     const char * /* id */,
     const char * /* name */,
     const char * /* version */,
-    CORBA_InterfaceDef_ptr  /* interface_type */,
-    CORBA::Environment & /* ACE_TRY_ENV */
+    CORBA_InterfaceDef_ptr  /* interface_type */
+    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -262,13 +262,13 @@ TAO_ComponentDef_i::create_provides_i (
   return 0;
 }
 
-IR::UsesDef_ptr 
+IR::UsesDef_ptr
 TAO_ComponentDef_i::create_uses (const char *id,
                                  const char *name,
                                  const char *version,
                                  CORBA_InterfaceDef_ptr interface_type,
-                                 CORBA::Boolean is_multiple,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CORBA::Boolean is_multiple
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (IR::UsesDef::_nil ());
@@ -277,29 +277,29 @@ TAO_ComponentDef_i::create_uses (const char *id,
                               name,
                               version,
                               interface_type,
-                              is_multiple,
-                              ACE_TRY_ENV);
+                              is_multiple
+                              TAO_ENV_ARG_PARAMETER);
 }
 
-IR::UsesDef_ptr 
+IR::UsesDef_ptr
 TAO_ComponentDef_i::create_uses_i (const char * /* id */,
                                    const char * /* name */,
                                    const char * /* version */,
                                    CORBA_InterfaceDef_ptr  /* interface_type */,
-                                   CORBA::Boolean /* is_multiple */,
-                                   CORBA::Environment & /* ACE_TRY_ENV */ )
+                                   CORBA::Boolean /* is_multiple */
+                                   TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-IR::EmitsDef_ptr 
+IR::EmitsDef_ptr
 TAO_ComponentDef_i::create_emits (const char *id,
                                   const char *name,
                                   const char *version,
-                                  CORBA_ValueDef_ptr value,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA_ValueDef_ptr value
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (IR::EmitsDef::_nil ());
@@ -307,28 +307,28 @@ TAO_ComponentDef_i::create_emits (const char *id,
   return this->create_emits_i (id,
                                name,
                                version,
-                               value,
-                                ACE_TRY_ENV);
+                               value
+                                TAO_ENV_ARG_PARAMETER);
 }
 
-IR::EmitsDef_ptr 
+IR::EmitsDef_ptr
 TAO_ComponentDef_i::create_emits_i (const char * /* id */,
                                     const char * /* name */,
                                     const char * /* version */,
-                                    CORBA_ValueDef_ptr  /* value */,
-                                    CORBA::Environment & /* ACE_TRY_ENV */)
+                                    CORBA_ValueDef_ptr  /* value */
+                                    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-IR::PublishesDef_ptr 
+IR::PublishesDef_ptr
 TAO_ComponentDef_i::create_publishes (const char *id,
                                       const char *name,
                                       const char *version,
-                                      CORBA_ValueDef_ptr value,
-                                      CORBA::Environment &ACE_TRY_ENV)
+                                      CORBA_ValueDef_ptr value
+                                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (IR::PublishesDef::_nil ());
@@ -336,28 +336,28 @@ TAO_ComponentDef_i::create_publishes (const char *id,
   return this->create_publishes_i (id,
                                    name,
                                    version,
-                                   value,
-                                   ACE_TRY_ENV);
+                                   value
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
-IR::PublishesDef_ptr 
+IR::PublishesDef_ptr
 TAO_ComponentDef_i::create_publishes_i (const char * /* id */,
                                         const char * /* name */,
                                         const char * /* version */,
-                                        CORBA_ValueDef_ptr  /* value */,
-                                        CORBA::Environment & /* ACE_TRY_ENV */)
+                                        CORBA_ValueDef_ptr  /* value */
+                                        TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-IR::ConsumesDef_ptr 
+IR::ConsumesDef_ptr
 TAO_ComponentDef_i::create_consumes (const char *id,
                                      const char *name,
                                      const char *version,
-                                     CORBA_ValueDef_ptr value,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     CORBA_ValueDef_ptr value
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (IR::ConsumesDef::_nil ());
@@ -365,16 +365,16 @@ TAO_ComponentDef_i::create_consumes (const char *id,
   return this->create_consumes_i (id,
                                   name,
                                   version,
-                                  value,
-                                  ACE_TRY_ENV);
+                                  value
+                                  TAO_ENV_ARG_PARAMETER);
 }
 
-IR::ConsumesDef_ptr 
+IR::ConsumesDef_ptr
 TAO_ComponentDef_i::create_consumes_i (const char * /* id */,
                                        const char * /* name */,
                                        const char * /* version */,
-                                       CORBA_ValueDef_ptr  /* value */,
-                                       CORBA::Environment & /* ACE_TRY_ENV */)
+                                       CORBA_ValueDef_ptr  /* value */
+                                       TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/ComponentDef_i.h b/TAO/orbsvcs/IFR_Service/ComponentDef_i.h
index a76d5b4a33d..b133e020ab2 100644
--- a/TAO/orbsvcs/IFR_Service/ComponentDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/ComponentDef_i.h
@@ -49,185 +49,158 @@ public:
   // Constructor
 
   virtual ~TAO_ComponentDef_i (void);
-  // Destructor  
+  // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA_InterfaceDefSeq *supported_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_InterfaceDefSeq *supported_interfaces_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void supported_interfaces (
-      const CORBA_InterfaceDefSeq &supported_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq &supported_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void supported_interfaces_i (
-      const CORBA_InterfaceDefSeq &supported_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq &supported_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::ComponentDef_ptr base_component (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::ComponentDef_ptr base_component_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::ProvidesDefSeq *provides_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::ProvidesDefSeq *provides_interfaces_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::UsesDefSeq *uses_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::UsesDefSeq *uses_interfaces_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::EmitsDefSeq *emits_events (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::EmitsDefSeq *emits_events_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::PublishesDefSeq *publishes_events (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::PublishesDefSeq *publishes_events_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::ConsumesDefSeq *consumes_events (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::ConsumesDefSeq *consumes_events_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_basic (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_basic_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::ProvidesDef_ptr create_provides (
       const char *id,
       const char *name,
       const char *version,
-      CORBA_InterfaceDef_ptr interface_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_InterfaceDef_ptr interface_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::ProvidesDef_ptr create_provides_i (
       const char *id,
       const char *name,
       const char *version,
-      CORBA_InterfaceDef_ptr interface_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_InterfaceDef_ptr interface_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::UsesDef_ptr create_uses (
@@ -235,10 +208,9 @@ public:
       const char *name,
       const char *version,
       CORBA_InterfaceDef_ptr interface_type,
-      CORBA::Boolean is_multiple,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean is_multiple
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::UsesDef_ptr create_uses_i (
@@ -246,70 +218,63 @@ public:
       const char *name,
       const char *version,
       CORBA_InterfaceDef_ptr interface_type,
-      CORBA::Boolean is_multiple,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean is_multiple
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::EmitsDef_ptr create_emits (
       const char *id,
       const char *name,
       const char *version,
-      CORBA_ValueDef_ptr value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_ValueDef_ptr value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::EmitsDef_ptr create_emits_i (
       const char *id,
       const char *name,
       const char *version,
-      CORBA_ValueDef_ptr value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_ValueDef_ptr value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::PublishesDef_ptr create_publishes (
       const char *id,
       const char *name,
       const char *version,
-      CORBA_ValueDef_ptr value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_ValueDef_ptr value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::PublishesDef_ptr create_publishes_i (
       const char *id,
       const char *name,
       const char *version,
-      CORBA_ValueDef_ptr value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_ValueDef_ptr value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::ConsumesDef_ptr create_consumes (
       const char *id,
       const char *name,
       const char *version,
-      CORBA_ValueDef_ptr value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_ValueDef_ptr value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::ConsumesDef_ptr create_consumes_i (
       const char *id,
       const char *name,
       const char *version,
-      CORBA_ValueDef_ptr value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_ValueDef_ptr value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/ComponentRepository_i.cpp b/TAO/orbsvcs/IFR_Service/ComponentRepository_i.cpp
index 046cef29dd0..20b5ee7ab3e 100644
--- a/TAO/orbsvcs/IFR_Service/ComponentRepository_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ComponentRepository_i.cpp
@@ -20,14 +20,14 @@ TAO_ComponentRepository_i::~TAO_ComponentRepository_i (void)
 {
 }
 
-IR::ComponentDef_ptr 
+IR::ComponentDef_ptr
 TAO_ComponentRepository_i::create_component (
     const char *id,
     const char *name,
     const char *version,
     IR::ComponentDef_ptr base_component,
-    const CORBA_InterfaceDefSeq & supports_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & supports_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -37,18 +37,18 @@ TAO_ComponentRepository_i::create_component (
                                    name,
                                    version,
                                    base_component,
-                                   supports_interfaces,
-                                   ACE_TRY_ENV);
+                                   supports_interfaces
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
-IR::ComponentDef_ptr 
+IR::ComponentDef_ptr
 TAO_ComponentRepository_i::create_component_i (
     const char * /* id */,
     const char * /* name */,
     const char * /* version */,
     IR::ComponentDef_ptr /* base_component */,
-    const CORBA_InterfaceDefSeq & /* supports_interfaces */,
-    CORBA::Environment & /* ACE_TRY_ENV */
+    const CORBA_InterfaceDefSeq & /* supports_interfaces */
+    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -56,15 +56,15 @@ TAO_ComponentRepository_i::create_component_i (
   return 0;
 }
 
-IR::HomeDef_ptr 
+IR::HomeDef_ptr
 TAO_ComponentRepository_i::create_home (
     const char *id,
     const char *name,
     const char *version,
     IR::HomeDef_ptr base_component,
     IR::ComponentDef_ptr managed_component,
-    CORBA_ValueDef_ptr primary_key,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_ValueDef_ptr primary_key
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -75,19 +75,19 @@ TAO_ComponentRepository_i::create_home (
                               version,
                               base_component,
                               managed_component,
-                              primary_key,
-                              ACE_TRY_ENV);
+                              primary_key
+                              TAO_ENV_ARG_PARAMETER);
 }
 
-IR::HomeDef_ptr 
+IR::HomeDef_ptr
 TAO_ComponentRepository_i::create_home_i (
     const char * /* id */,
     const char * /* name */,
     const char * /* version */,
     IR::HomeDef_ptr /* base_component */,
     IR::ComponentDef_ptr /* managed_component */,
-    CORBA_ValueDef_ptr /* primary_key */,
-    CORBA::Environment & /* ACE_TRY_ENV */
+    CORBA_ValueDef_ptr /* primary_key */
+    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
diff --git a/TAO/orbsvcs/IFR_Service/ComponentRepository_i.h b/TAO/orbsvcs/IFR_Service/ComponentRepository_i.h
index b8a46f2f3e1..32aae9cde29 100644
--- a/TAO/orbsvcs/IFR_Service/ComponentRepository_i.h
+++ b/TAO/orbsvcs/IFR_Service/ComponentRepository_i.h
@@ -42,7 +42,7 @@ class TAO_ComponentRepository_i : public TAO_Repository_i
   //
   // = DESCRIPTION
   //    Provides global access to the Interface Repository,
-  //    including access to information related to 
+  //    including access to information related to
   //    CORBA Components.
   //
 public:
@@ -59,10 +59,9 @@ public:
       const char *name,
       const char *version,
       IR::ComponentDef_ptr base_component,
-      const CORBA_InterfaceDefSeq & supports_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & supports_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::ComponentDef_ptr create_component_i (
@@ -70,10 +69,9 @@ public:
       const char *name,
       const char *version,
       IR::ComponentDef_ptr base_component,
-      const CORBA_InterfaceDefSeq & supports_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & supports_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::HomeDef_ptr create_home (
@@ -82,10 +80,9 @@ public:
       const char *version,
       IR::HomeDef_ptr base_home,
       IR::ComponentDef_ptr managed_component,
-      CORBA_ValueDef_ptr primary_key,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_ValueDef_ptr primary_key
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::HomeDef_ptr create_home_i (
@@ -94,10 +91,9 @@ public:
       const char *version,
       IR::HomeDef_ptr base_home,
       IR::ComponentDef_ptr managed_component,
-      CORBA_ValueDef_ptr primary_key,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_ValueDef_ptr primary_key
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/ConstantDef_i.cpp b/TAO/orbsvcs/IFR_Service/ConstantDef_i.cpp
index f2b9bb6ad69..c522edbd8f3 100644
--- a/TAO/orbsvcs/IFR_Service/ConstantDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ConstantDef_i.cpp
@@ -23,23 +23,23 @@ TAO_ConstantDef_i::~TAO_ConstantDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ConstantDef_i::def_kind (CORBA::Environment &)
+TAO_ConstantDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Constant;
 }
 
 CORBA_Contained::Description *
-TAO_ConstantDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_ConstantDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_ConstantDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_ConstantDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_Contained::Description *desc_ptr = 0;
@@ -50,15 +50,15 @@ TAO_ConstantDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
 
   CORBA_Contained::Description_var retval = desc_ptr;
 
-  retval->kind = this->def_kind (ACE_TRY_ENV);
+  retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA_ConstantDescription cd;
 
-  cd.name = this->name_i (ACE_TRY_ENV);
+  cd.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  cd.id = this->id_i (ACE_TRY_ENV);
+  cd.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_TString container_id;
@@ -69,13 +69,13 @@ TAO_ConstantDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
 
   cd.defined_in = container_id.c_str ();
 
-  cd.version = this->version_i (ACE_TRY_ENV);
+  cd.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  cd.type = this->type_i (ACE_TRY_ENV);
+  cd.type = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::Any_var val = this->value_i (ACE_TRY_ENV);
+  CORBA::Any_var val = this->value_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   cd.value = val.in ();
@@ -85,17 +85,17 @@ TAO_ConstantDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
   return retval._retn ();
 }
 
-CORBA::TypeCode_ptr 
-TAO_ConstantDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_ConstantDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_ConstantDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_ConstantDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString type_path;
@@ -110,26 +110,26 @@ TAO_ConstantDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
                                        0);
 
   TAO_IDLType_i *impl =
-    this->repo_->servant_factory ()->create_idltype (type_key,
-                                                     ACE_TRY_ENV);
+    this->repo_->servant_factory ()->create_idltype (type_key
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   auto_ptr<TAO_IDLType_i> safety (impl);
 
-  return impl->type_i (ACE_TRY_ENV);
+  return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_IDLType_ptr 
-TAO_ConstantDef_i::type_def (CORBA::Environment &ACE_TRY_ENV)
+CORBA_IDLType_ptr
+TAO_ConstantDef_i::type_def (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ());
 
-  return this->type_def_i (ACE_TRY_ENV);
+  return this->type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_IDLType_ptr 
-TAO_ConstantDef_i::type_def_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA_IDLType_ptr
+TAO_ConstantDef_i::type_def_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString type_path;
@@ -151,38 +151,38 @@ TAO_ConstantDef_i::type_def_i (CORBA::Environment &ACE_TRY_ENV)
   CORBA::DefinitionKind def_kind =
     ACE_static_cast (CORBA::DefinitionKind, kind);
 
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (def_kind,
-                                                    type_path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    type_path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
 
-  return CORBA_IDLType::_narrow (obj.in (),
-                                 ACE_TRY_ENV);
+  return CORBA_IDLType::_narrow (obj.in ()
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_ConstantDef_i::type_def (CORBA_IDLType_ptr type_def,
-                             CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ConstantDef_i::type_def (CORBA_IDLType_ptr type_def
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->type_def_i (type_def,
-                    ACE_TRY_ENV);
+  this->type_def_i (type_def
+                    TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_ConstantDef_i::type_def_i (CORBA_IDLType_ptr type_def,
-                               CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ConstantDef_i::type_def_i (CORBA_IDLType_ptr type_def
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::ObjectId_var oid = 
-    this->repo_->ir_poa ()->reference_to_id (type_def,
-                                             ACE_TRY_ENV);
+  PortableServer::ObjectId_var oid =
+    this->repo_->ir_poa ()->reference_to_id (type_def
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::String_var type_path = 
+  CORBA::String_var type_path =
     PortableServer::ObjectId_to_string (oid.in ());
 
   this->repo_->config ()->set_string_value (this->section_key_,
@@ -191,19 +191,19 @@ TAO_ConstantDef_i::type_def_i (CORBA_IDLType_ptr type_def,
 }
 
 CORBA::Any *
-TAO_ConstantDef_i::value (CORBA::Environment &ACE_TRY_ENV)
+TAO_ConstantDef_i::value (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->value_i (ACE_TRY_ENV);
+  return this->value_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Any *
-TAO_ConstantDef_i::value_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_ConstantDef_i::value_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::TypeCode_var tc = this->type_i (ACE_TRY_ENV);
+  CORBA::TypeCode_var tc = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   void *ref = 0;
@@ -220,7 +220,7 @@ TAO_ConstantDef_i::value_i (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_Auto_Basic_Ptr<char> safety (data);
 
-  ACE_Message_Block mb (data, 
+  ACE_Message_Block mb (data,
                         length);
 
   mb.length (length);
@@ -237,23 +237,23 @@ TAO_ConstantDef_i::value_i (CORBA::Environment &ACE_TRY_ENV)
   return retval;
 }
 
-void 
-TAO_ConstantDef_i::value (const CORBA::Any &value,
-                          CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ConstantDef_i::value (const CORBA::Any &value
+                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->value_i (value,
-                 ACE_TRY_ENV);
+  this->value_i (value
+                 TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_ConstantDef_i::value_i (const CORBA::Any &value,
-                            CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ConstantDef_i::value_i (const CORBA::Any &value
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::TypeCode_var my_tc = this->type_i (ACE_TRY_ENV);
+  CORBA::TypeCode_var my_tc = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeCode_var val_tc = value.type ();
@@ -263,7 +263,7 @@ TAO_ConstantDef_i::value_i (const CORBA::Any &value,
 
   ACE_Message_Block *mb = value._tao_get_cdr ();
 
-  CORBA::TCKind kind = val_tc->kind (ACE_TRY_ENV);
+  CORBA::TCKind kind = val_tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   switch (kind)
diff --git a/TAO/orbsvcs/IFR_Service/ConstantDef_i.h b/TAO/orbsvcs/IFR_Service/ConstantDef_i.h
index 5bb2e3b4672..e2ad2105210 100644
--- a/TAO/orbsvcs/IFR_Service/ConstantDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/ConstantDef_i.h
@@ -50,88 +50,75 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_IDLType_ptr type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_IDLType_ptr type_def_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void type_def (
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void type_def_i (
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any *value (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Any *value_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void value (
-      const CORBA::Any &value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any &value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void value_i (
-      const CORBA::Any &value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any &value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/ConsumesDef_i.cpp b/TAO/orbsvcs/IFR_Service/ConsumesDef_i.cpp
index 872a882823f..9710a5fb7ee 100644
--- a/TAO/orbsvcs/IFR_Service/ConsumesDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ConsumesDef_i.cpp
@@ -21,39 +21,39 @@ TAO_ConsumesDef_i::~TAO_ConsumesDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ConsumesDef_i::def_kind (CORBA::Environment &)
+TAO_ConsumesDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Consumes;
 }
 
 void 
-TAO_ConsumesDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_ConsumesDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void 
-TAO_ConsumesDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ConsumesDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_ConsumesDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_ConsumesDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_ConsumesDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ConsumesDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/ConsumesDef_i.h b/TAO/orbsvcs/IFR_Service/ConsumesDef_i.h
index 94383537afd..20c1acf586d 100644
--- a/TAO/orbsvcs/IFR_Service/ConsumesDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/ConsumesDef_i.h
@@ -51,36 +51,31 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 };
diff --git a/TAO/orbsvcs/IFR_Service/Contained_i.cpp b/TAO/orbsvcs/IFR_Service/Contained_i.cpp
index 1417f706ea3..44414e16b2a 100644
--- a/TAO/orbsvcs/IFR_Service/Contained_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/Contained_i.cpp
@@ -20,16 +20,16 @@ TAO_Contained_i::~TAO_Contained_i (void)
 }
 
 void
-TAO_Contained_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Contained_i::destroy_i (CORBA::Environment &)
+TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -85,16 +85,16 @@ TAO_Contained_i::destroy_i (CORBA::Environment &)
 }
 
 char *
-TAO_Contained_i::id (CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::id (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->id_i (ACE_TRY_ENV);
+  return this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 char *
-TAO_Contained_i::id_i (CORBA::Environment &)
+TAO_Contained_i::id_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString retval;
@@ -106,19 +106,19 @@ TAO_Contained_i::id_i (CORBA::Environment &)
 }
 
 void
-TAO_Contained_i::id (const char *id,
-                     CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::id (const char *id
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->id_i (id,
-              ACE_TRY_ENV);
+  this->id_i (id
+              TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Contained_i::id_i (const char *id,
-                       CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::id_i (const char *id
+                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString tmp;
@@ -162,16 +162,16 @@ TAO_Contained_i::id_i (const char *id,
 }
 
 char *
-TAO_Contained_i::name (CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::name (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->name_i (ACE_TRY_ENV);
+  return this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 char *
-TAO_Contained_i::name_i (CORBA::Environment &)
+TAO_Contained_i::name_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString retval;
@@ -183,16 +183,16 @@ TAO_Contained_i::name_i (CORBA::Environment &)
 }
 
 char *
-TAO_Contained_i::version (CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::version (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->version_i (ACE_TRY_ENV);
+  return this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 char *
-TAO_Contained_i::version_i (CORBA::Environment &)
+TAO_Contained_i::version_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString retval;
@@ -204,24 +204,24 @@ TAO_Contained_i::version_i (CORBA::Environment &)
 }
 
 void
-TAO_Contained_i::name (const char *name,
-                       CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::name (const char *name
+                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->name_i (name,
-                ACE_TRY_ENV);
+  this->name_i (name
+                TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Contained_i::name_i (const char *name,
-                         CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::name_i (const char *name
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Check if name already exists in this container.
-  CORBA::Boolean exists = this->name_exists (name,
-                                             ACE_TRY_ENV);
+  CORBA::Boolean exists = this->name_exists (name
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (exists)
@@ -252,19 +252,19 @@ TAO_Contained_i::name_i (const char *name,
 }
 
 void
-TAO_Contained_i::version (const char *version,
-                          CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::version (const char *version
+                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->version_i (version,
-                   ACE_TRY_ENV);
+  this->version_i (version
+                   TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Contained_i::version_i (const char *version,
-                            CORBA::Environment &)
+TAO_Contained_i::version_i (const char *version
+                            TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_string_value (this->section_key_,
@@ -273,16 +273,16 @@ TAO_Contained_i::version_i (const char *version,
 }
 
 CORBA_Container_ptr
-TAO_Contained_i::defined_in (CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::defined_in (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_Container::_nil ());
 
-  return this->defined_in_i (ACE_TRY_ENV);
+  return this->defined_in_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Container_ptr
-TAO_Contained_i::defined_in_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::defined_in_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString container_id;
@@ -314,28 +314,28 @@ TAO_Contained_i::defined_in_i (CORBA::Environment &ACE_TRY_ENV)
 
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (def_kind,
-                                                    container_path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    container_path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_Container::_nil ());
 
-  CORBA_Container_var retval = CORBA_Container::_narrow (obj.in (),
-                                                         ACE_TRY_ENV);
+  CORBA_Container_var retval = CORBA_Container::_narrow (obj.in ()
+                                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_Container::_nil ());
 
   return retval._retn ();
 }
 
 char *
-TAO_Contained_i::absolute_name (CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::absolute_name (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->absolute_name_i (ACE_TRY_ENV);
+  return this->absolute_name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 char *
-TAO_Contained_i::absolute_name_i (CORBA::Environment &)
+TAO_Contained_i::absolute_name_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString absolute_name;
@@ -347,16 +347,16 @@ TAO_Contained_i::absolute_name_i (CORBA::Environment &)
 }
 
 CORBA_Repository_ptr
-TAO_Contained_i::containing_repository (CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::containing_repository (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_Repository::_nil ());
 
-  return this->containing_repository_i (ACE_TRY_ENV);
+  return this->containing_repository_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Repository_ptr
-TAO_Contained_i::containing_repository_i (CORBA::Environment &)
+TAO_Contained_i::containing_repository_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->repo_->repo_objref ();
@@ -365,8 +365,8 @@ TAO_Contained_i::containing_repository_i (CORBA::Environment &)
 void
 TAO_Contained_i::move (CORBA_Container_ptr new_container,
                        const char *new_name,
-                       const char *new_version,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       const char *new_version
+                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
@@ -374,13 +374,13 @@ TAO_Contained_i::move (CORBA_Container_ptr new_container,
   this->move_i (new_container,
                 new_name,
                 new_version,
-                1,
-                ACE_TRY_ENV);
+                1
+                TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
-TAO_Contained_i::name_exists (const char *name,
-                              CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::name_exists (const char *name
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString container_id;
@@ -390,8 +390,8 @@ TAO_Contained_i::name_exists (const char *name,
 
   if (container_id == "")
     {
-      return this->repo_->name_exists (name,
-                                       ACE_TRY_ENV);
+      return this->repo_->name_exists (name
+                                       TAO_ENV_ARG_PARAMETER);
     }
 
   ACE_TString container_path;
@@ -484,16 +484,16 @@ void
 TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                          const char *new_name,
                          const char *new_version,
-                         CORBA::Boolean cleanup,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         CORBA::Boolean cleanup
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_Repository_var my_repo =
-    this->containing_repository_i (ACE_TRY_ENV);
+    this->containing_repository_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::DefinitionKind container_dk =
-    new_container->def_kind (ACE_TRY_ENV);
+    new_container->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_Configuration_Section_Key container_key;
@@ -515,8 +515,8 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
   else
     {
       PortableServer::ObjectId_var oid =
-        this->repo_->ir_poa ()->reference_to_id (new_container,
-                                                 ACE_TRY_ENV);
+        this->repo_->ir_poa ()->reference_to_id (new_container
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::String_var container_path =
@@ -527,15 +527,15 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                                            container_key,
                                            0);
 
-      TAO_Contained_i *impl = 
-        this->repo_->servant_factory ()->create_contained (container_key,
-                                                           ACE_TRY_ENV);
+      TAO_Contained_i *impl =
+        this->repo_->servant_factory ()->create_contained (container_key
+                                                           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       auto_ptr<TAO_Contained_i> safety (impl);
 
       CORBA_Repository_var your_repo =
-        impl->containing_repository_i (ACE_TRY_ENV);
+        impl->containing_repository_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (my_repo.in () != your_repo.in ())
@@ -543,16 +543,16 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           ACE_THROW (CORBA::BAD_PARAM (4, CORBA::COMPLETED_NO));
         }
 
-      container_impl = 
-        this->repo_->servant_factory ()->create_container (container_key,
-                                                           ACE_TRY_ENV);
+      container_impl =
+        this->repo_->servant_factory ()->create_container (container_key
+                                                           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
-  CORBA::DefinitionKind my_dk = this->def_kind (ACE_TRY_ENV);
+  CORBA::DefinitionKind my_dk = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::String_var id = this->id_i (ACE_TRY_ENV);
+  CORBA::String_var id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // If an exception is thrown, this must be restored.
@@ -576,7 +576,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           TAO_EnumDef_i impl (this->repo_,
                               this->section_key_);
 
-          CORBA_EnumMemberSeq_var members = impl.members_i (ACE_TRY_ENV);
+          CORBA_EnumMemberSeq_var members = impl.members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (container_dk == CORBA::dk_Struct
@@ -585,8 +585,8 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
             {
               this->move_pre_process (new_container,
                                       my_path.c_str (),
-                                      new_name,
-                                      ACE_TRY_ENV);
+                                      new_name
+                                      TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -594,8 +594,8 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
             container_impl->create_enum_i (id.in (),
                                            new_name,
                                            new_version,
-                                           members.in (),
-                                           ACE_TRY_ENV);
+                                           members.in ()
+                                           TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           break;
         }
@@ -604,14 +604,14 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           TAO_AliasDef_i impl (this->repo_,
                                this->section_key_);
 
-          CORBA_IDLType_var otype = impl.original_type_def_i (ACE_TRY_ENV);
+          CORBA_IDLType_var otype = impl.original_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           container_impl->create_alias_i (id.in (),
                                           new_name,
                                           new_version,
-                                          otype.in (),
-                                          ACE_TRY_ENV);
+                                          otype.in ()
+                                          TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           break;
         }
@@ -619,8 +619,8 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
         {
           container_impl->create_native_i (id.in (),
                                            new_name,
-                                           new_version,
-                                           ACE_TRY_ENV);
+                                           new_version
+                                           TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           break;
         }
@@ -629,14 +629,14 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           TAO_ValueBoxDef_i impl (this->repo_,
                                   this->section_key_);
 
-          CORBA_IDLType_var otype = impl.original_type_def_i (ACE_TRY_ENV);
+          CORBA_IDLType_var otype = impl.original_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           container_impl->create_value_box_i (id.in (),
                                               new_name,
                                               new_version,
-                                              otype.in (),
-                                              ACE_TRY_ENV);
+                                              otype.in ()
+                                              TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           break;
         }
@@ -645,7 +645,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           TAO_StructDef_i impl (this->repo_,
                                 this->section_key_);
 
-          CORBA_StructMemberSeq_var members = impl.members_i (ACE_TRY_ENV);
+          CORBA_StructMemberSeq_var members = impl.members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (container_dk == CORBA::dk_Struct
@@ -654,8 +654,8 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
             {
               this->move_pre_process (new_container,
                                       my_path.c_str (),
-                                      new_name,
-                                      ACE_TRY_ENV);
+                                      new_name
+                                      TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -663,12 +663,12 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
             container_impl->create_struct_i (id.in (),
                                              new_name,
                                              new_version,
-                                             members.in (),
-                                             ACE_TRY_ENV);
+                                             members.in ()
+                                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          this->move_contents (new_defn.in (),
-                               ACE_TRY_ENV);
+          this->move_contents (new_defn.in ()
+                               TAO_ENV_ARG_PARAMETER);
 
           break;
         }
@@ -678,10 +678,10 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                                this->section_key_);
 
           CORBA_IDLType_var disc_type =
-            impl.discriminator_type_def_i (ACE_TRY_ENV);
+            impl.discriminator_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          CORBA_UnionMemberSeq_var members = impl.members_i (ACE_TRY_ENV);
+          CORBA_UnionMemberSeq_var members = impl.members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (container_dk == CORBA::dk_Struct
@@ -690,8 +690,8 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
             {
               this->move_pre_process (new_container,
                                       my_path.c_str (),
-                                      new_name,
-                                      ACE_TRY_ENV);
+                                      new_name
+                                      TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -700,12 +700,12 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                                             new_name,
                                             new_version,
                                             disc_type.in (),
-                                            members.in (),
-                                            ACE_TRY_ENV);
+                                            members.in ()
+                                            TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          this->move_contents (new_defn.in (),
-                               ACE_TRY_ENV);
+          this->move_contents (new_defn.in ()
+                               TAO_ENV_ARG_PARAMETER);
 
           break;
         }
@@ -714,12 +714,12 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           CORBA_ModuleDef_var new_defn =
             container_impl->create_module_i (id.in (),
                                              new_name,
-                                             new_version,
-                                             ACE_TRY_ENV);
+                                             new_version
+                                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          this->move_contents (new_defn.in (),
-                               ACE_TRY_ENV);
+          this->move_contents (new_defn.in ()
+                               TAO_ENV_ARG_PARAMETER);
 
           break;
         }
@@ -728,19 +728,19 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           TAO_ExceptionDef_i impl (this->repo_,
                                    this->section_key_);
 
-          CORBA_StructMemberSeq_var members = impl.members_i (ACE_TRY_ENV);
+          CORBA_StructMemberSeq_var members = impl.members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA_ExceptionDef_var new_defn =
             container_impl->create_exception_i (id.in (),
                                                 new_name,
                                                 new_version,
-                                                members.in (),
-                                                ACE_TRY_ENV);
+                                                members.in ()
+                                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          this->move_contents (new_defn.in (),
-                               ACE_TRY_ENV);
+          this->move_contents (new_defn.in ()
+                               TAO_ENV_ARG_PARAMETER);
 
           break;
         }
@@ -749,20 +749,20 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           TAO_InterfaceDef_i impl (this->repo_,
                                    this->section_key_);
 
-          CORBA_InterfaceDefSeq_var bases = 
-            impl.base_interfaces_i (ACE_TRY_ENV);
+          CORBA_InterfaceDefSeq_var bases =
+            impl.base_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA_InterfaceDef_var new_defn =
             container_impl->create_interface_i (id.in (),
                                                 new_name,
                                                 new_version,
-                                                bases.in (),
-                                                ACE_TRY_ENV);
+                                                bases.in ()
+                                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          this->move_contents (new_defn.in (),
-                               ACE_TRY_ENV);
+          this->move_contents (new_defn.in ()
+                               TAO_ENV_ARG_PARAMETER);
 
           break;
         }
@@ -771,18 +771,18 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           TAO_ConstantDef_i impl (this->repo_,
                                   this->section_key_);
 
-          CORBA_IDLType_var type_def = impl.type_def_i (ACE_TRY_ENV);
+          CORBA_IDLType_var type_def = impl.type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          CORBA::Any_var value = impl.value_i (ACE_TRY_ENV);
+          CORBA::Any_var value = impl.value_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           container_impl->create_constant_i (id.in (),
                                              new_name,
                                              new_version,
                                              type_def.in (),
-                                             value.in (),
-                                             ACE_TRY_ENV);
+                                             value.in ()
+                                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           break;
         }
@@ -791,10 +791,10 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           TAO_AttributeDef_i impl (this->repo_,
                                    this->section_key_);
 
-          CORBA_IDLType_var type_def = impl.type_def_i (ACE_TRY_ENV);
+          CORBA_IDLType_var type_def = impl.type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          CORBA::AttributeMode mode = impl.mode_i (ACE_TRY_ENV);
+          CORBA::AttributeMode mode = impl.mode_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (container_dk == CORBA::dk_Interface)
@@ -806,8 +806,8 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                                        new_name,
                                        new_version,
                                        type_def.in (),
-                                       mode,
-                                       ACE_TRY_ENV);
+                                       mode
+                                       TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               break;
             }
@@ -820,8 +820,8 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                                        new_name,
                                        new_version,
                                        type_def.in (),
-                                       mode,
-                                       ACE_TRY_ENV);
+                                       mode
+                                       TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               break;
             }
@@ -835,20 +835,20 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           TAO_OperationDef_i impl (this->repo_,
                                    this->section_key_);
 
-          CORBA_IDLType_var result = impl.result_def_i (ACE_TRY_ENV);
+          CORBA_IDLType_var result = impl.result_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          CORBA::OperationMode mode = impl.mode_i (ACE_TRY_ENV);
+          CORBA::OperationMode mode = impl.mode_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          CORBA_ParDescriptionSeq_var params = impl.params_i (ACE_TRY_ENV);
+          CORBA_ParDescriptionSeq_var params = impl.params_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          CORBA_ExceptionDefSeq_var exceptions = 
-            impl.exceptions_i (ACE_TRY_ENV);
+          CORBA_ExceptionDefSeq_var exceptions =
+            impl.exceptions_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          CORBA_ContextIdSeq_var contexts = impl.contexts_i (ACE_TRY_ENV);
+          CORBA_ContextIdSeq_var contexts = impl.contexts_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (container_dk == CORBA::dk_Interface)
@@ -863,8 +863,8 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                                        mode,
                                        params.in (),
                                        exceptions.in (),
-                                       contexts.in (),
-                                       ACE_TRY_ENV);
+                                       contexts.in ()
+                                       TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               break;
             }
@@ -880,8 +880,8 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                                        mode,
                                        params.in (),
                                        exceptions.in (),
-                                       contexts.in (),
-                                       ACE_TRY_ENV);
+                                       contexts.in ()
+                                       TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               break;
             }
@@ -966,13 +966,13 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
 void
 TAO_Contained_i::move_pre_process (CORBA_Container_ptr container,
                                    const char *contained_path,
-                                   const char *name,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   const char *name
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var container_oid =
-    this->repo_->ir_poa ()->reference_to_id (container,
-                                             ACE_TRY_ENV);
+    this->repo_->ir_poa ()->reference_to_id (container
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var container_path =
@@ -1026,8 +1026,8 @@ TAO_Contained_i::move_pre_process (CORBA_Container_ptr container,
 }
 
 void
-TAO_Contained_i::move_contents (CORBA_Container_ptr new_container,
-                                CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::move_contents (CORBA_Container_ptr new_container
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString name;
@@ -1069,8 +1069,8 @@ TAO_Contained_i::move_contents (CORBA_Container_ptr new_container,
 
               TAO_Contained_i *impl =
                 this->repo_->servant_factory ()->create_contained (
-                                                     defn_key,
-                                                     ACE_TRY_ENV
+                                                     defn_key
+                                                     TAO_ENV_ARG_PARAMETER
                                                    );
               ACE_CHECK;
 
@@ -1079,14 +1079,14 @@ TAO_Contained_i::move_contents (CORBA_Container_ptr new_container,
               impl->move_i (new_container,
                             name.c_str (),
                             version.c_str (),
-                            0,
-                            ACE_TRY_ENV);
+                            0
+                            TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
     }
 
-  CORBA::DefinitionKind kind = this->def_kind (ACE_TRY_ENV);
+  CORBA::DefinitionKind kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Specific to InterfaceDef_i and ValueDef_i
@@ -1130,8 +1130,8 @@ TAO_Contained_i::move_contents (CORBA_Container_ptr new_container,
               impl.move_i (new_container,
                            name.c_str (),
                            version.c_str (),
-                           0,
-                           ACE_TRY_ENV);
+                           0
+                           TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
@@ -1173,8 +1173,8 @@ TAO_Contained_i::move_contents (CORBA_Container_ptr new_container,
               impl.move_i (new_container,
                            name.c_str (),
                            version.c_str (),
-                           0,
-                           ACE_TRY_ENV);
+                           0
+                           TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
diff --git a/TAO/orbsvcs/IFR_Service/Contained_i.h b/TAO/orbsvcs/IFR_Service/Contained_i.h
index 5b1422c0bc9..299288402e9 100644
--- a/TAO/orbsvcs/IFR_Service/Contained_i.h
+++ b/TAO/orbsvcs/IFR_Service/Contained_i.h
@@ -51,153 +51,130 @@ public:
   // Destructor.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char *id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   char *id_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void id (
-      const char *id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void id_i (
-      const char *id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char *name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   char *name_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void name (
-      const char *name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void name_i (
-      const char *name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char *version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   char *version_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void version (
-      const char *version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void version_i (
-      const char *version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_Container_ptr defined_in_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char *absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   char *absolute_name_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_Repository_ptr containing_repository_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Pure virtual.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Pure virtual.
 
   virtual void move (
       CORBA_Container_ptr new_container,
       const char *new_name,
-      const char *new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
@@ -205,10 +182,9 @@ protected:
       CORBA_Container_ptr new_container,
       const char *new_name,
       const char *new_version,
-      CORBA::Boolean cleanup,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean cleanup
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Engine for move() with an extra 'cleanup'
   // parameter. Since a section removal can be
@@ -217,10 +193,9 @@ protected:
 
 private:
   CORBA::Boolean name_exists (
-      const char *name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Check if <name> already exists in our container
 
@@ -233,10 +208,9 @@ private:
   void move_pre_process (
       CORBA_Container_ptr container,
       const char *contained_path,
-      const char *name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Mangle the names of references that are also
   // defined in the scope, so a name clash will
@@ -244,10 +218,9 @@ private:
   // unmangles the names.
 
   void move_contents (
-      CORBA_Container_ptr new_container,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_Container_ptr new_container
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Recursively calls move_i for definitions,
   // as well as operations and attributes if
diff --git a/TAO/orbsvcs/IFR_Service/Container_i.cpp b/TAO/orbsvcs/IFR_Service/Container_i.cpp
index 9e7c6fd25e2..c3bbfcc8e0f 100644
--- a/TAO/orbsvcs/IFR_Service/Container_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/Container_i.cpp
@@ -21,16 +21,16 @@ TAO_Container_i::~TAO_Container_i (void)
 }
 
 void
-TAO_Container_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_Container_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Container_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int index = 0;
@@ -39,12 +39,12 @@ TAO_Container_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
 
   // Destroy and/or remove references.
 
-	ACE_Configuration_Section_Key refs_key;
-	status =
-		this->repo_->config ()->open_section (this->section_key_,
-																					"refs",
-																					0,
-																					refs_key);
+        ACE_Configuration_Section_Key refs_key;
+        status =
+                this->repo_->config ()->open_section (this->section_key_,
+                                                                                                                                                                        "refs",
+                                                                                                                                                                        0,
+                                                                                                                                                                        refs_key);
 
   // This section may not have been created.
   if (status == 0)
@@ -76,13 +76,13 @@ TAO_Container_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
           if (status == 0)
             {
               TAO_IDLType_i *impl =
-                this->repo_->servant_factory ()->create_idltype (entry_key,
-                                                                 ACE_TRY_ENV);
+                this->repo_->servant_factory ()->create_idltype (entry_key
+                                                                 TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
 
               auto_ptr<TAO_IDLType_i> safety (impl);
 
-              CORBA::DefinitionKind def_kind = impl->def_kind (ACE_TRY_ENV);
+              CORBA::DefinitionKind def_kind = impl->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_CHECK;
 
               switch (def_kind)
@@ -95,7 +95,7 @@ TAO_Container_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
                 case CORBA::dk_Fixed:
                 case CORBA::dk_Array:
                 case CORBA::dk_Sequence:
-                  impl->destroy_i (ACE_TRY_ENV);
+                  impl->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
                   ACE_CHECK;
                   break;
                 default:
@@ -145,13 +145,13 @@ TAO_Container_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
                                                 defn_key);
 
           TAO_Contained_i *impl =
-            this->repo_->servant_factory ()->create_contained (defn_key,
-                                                               ACE_TRY_ENV);
+            this->repo_->servant_factory ()->create_contained (defn_key
+                                                               TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           auto_ptr<TAO_Contained_i> safety (impl);
 
-          impl->destroy_i (ACE_TRY_ENV);
+          impl->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -162,19 +162,19 @@ TAO_Container_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA_Contained_ptr
-TAO_Container_i::lookup (const char *search_name,
-                         CORBA::Environment &ACE_TRY_ENV)
+TAO_Container_i::lookup (const char *search_name
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->lookup_i (search_name,
-                         ACE_TRY_ENV);
+  return this->lookup_i (search_name
+                         TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_Contained_ptr
-TAO_Container_i::lookup_i (const char *search_name,
-                           CORBA::Environment &ACE_TRY_ENV)
+TAO_Container_i::lookup_i (const char *search_name
+                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration_Section_Key iter_key;
@@ -377,31 +377,31 @@ TAO_Container_i::lookup_i (const char *search_name,
 
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (def_kind,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_Contained::_nil ());
 
-  return CORBA_Contained::_narrow (obj.in (),
-                                   ACE_TRY_ENV);
+  return CORBA_Contained::_narrow (obj.in ()
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ContainedSeq *
 TAO_Container_i::contents (CORBA::DefinitionKind limit_type,
-                           CORBA::Boolean exclude_inherited,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Boolean exclude_inherited
+                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
   return this->contents_i (limit_type,
-                           exclude_inherited,
-                           ACE_TRY_ENV);
+                           exclude_inherited
+                           TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ContainedSeq *
 TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type,
-                             CORBA::Boolean exclude_inherited,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Boolean exclude_inherited
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (limit_type == CORBA::dk_none)
@@ -467,7 +467,7 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type,
 
   // Base interfaces
 
-  CORBA::DefinitionKind def_kind = this->def_kind (ACE_TRY_ENV);
+  CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (def_kind == CORBA::dk_Interface)
@@ -482,8 +482,8 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type,
           iface.interface_contents (kind_queue,
                                     path_queue,
                                     limit_type,
-                                    exclude_inherited,
-                                    ACE_TRY_ENV);
+                                    exclude_inherited
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
         }
     }
@@ -510,13 +510,13 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type,
 
       CORBA::Object_var obj =
         this->repo_->servant_factory ()->create_objref (next_kind,
-                                                        next_path.c_str (),
-                                                        ACE_TRY_ENV);
+                                                        next_path.c_str ()
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       CORBA_Contained_var next_cont =
-        CORBA_Contained::_narrow (obj.in (),
-                                  ACE_TRY_ENV);
+        CORBA_Contained::_narrow (obj.in ()
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       retval[j] = next_cont._retn ();
@@ -529,8 +529,8 @@ CORBA_ContainedSeq *
 TAO_Container_i::lookup_name (const char *search_name,
                               CORBA::Long levels_to_search,
                               CORBA::DefinitionKind limit_type,
-                              CORBA::Boolean exclude_inherited,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Boolean exclude_inherited
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
@@ -538,16 +538,16 @@ TAO_Container_i::lookup_name (const char *search_name,
   return this->lookup_name_i (search_name,
                               levels_to_search,
                               limit_type,
-                              exclude_inherited,
-                              ACE_TRY_ENV);
+                              exclude_inherited
+                              TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ContainedSeq *
 TAO_Container_i::lookup_name_i (const char *search_name,
                                 CORBA::Long levels_to_search,
                                 CORBA::DefinitionKind limit_type,
-                                CORBA::Boolean exclude_inherited,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Boolean exclude_inherited
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue;
@@ -558,8 +558,8 @@ TAO_Container_i::lookup_name_i (const char *search_name,
                                search_name,
                                levels_to_search,
                                limit_type,
-                               exclude_inherited,
-                               ACE_TRY_ENV);
+                               exclude_inherited
+                               TAO_ENV_ARG_PARAMETER);
 
   size_t size = kind_queue.size ();
 
@@ -582,13 +582,13 @@ TAO_Container_i::lookup_name_i (const char *search_name,
 
       CORBA::Object_var obj =
         this->repo_->servant_factory ()->create_objref (next_kind,
-                                                        next_path.c_str (),
-                                                        ACE_TRY_ENV);
+                                                        next_path.c_str ()
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       CORBA_Contained_var next_cont =
-        CORBA_Contained::_narrow (obj.in (),
-                                  ACE_TRY_ENV);
+        CORBA_Contained::_narrow (obj.in ()
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       retval[i] = next_cont._retn ();
@@ -600,28 +600,28 @@ TAO_Container_i::lookup_name_i (const char *search_name,
 CORBA_Container::DescriptionSeq *
 TAO_Container_i::describe_contents (CORBA::DefinitionKind limit_type,
                                     CORBA::Boolean exclude_inherited,
-                                    CORBA::Long max_returned_objs,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    CORBA::Long max_returned_objs
+                                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
   return this->describe_contents_i (limit_type,
                                     exclude_inherited,
-                                    max_returned_objs,
-                                    ACE_TRY_ENV);
+                                    max_returned_objs
+                                    TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_Container::DescriptionSeq *
 TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type,
                                       CORBA::Boolean exclude_inherited,
-                                      CORBA::Long max_returned_objs,
-                                      CORBA::Environment &ACE_TRY_ENV)
+                                      CORBA::Long max_returned_objs
+                                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_ContainedSeq_var contents = this->contents_i (limit_type,
-                                                      exclude_inherited,
-                                                      ACE_TRY_ENV);
+                                                      exclude_inherited
+                                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong length = contents->length ();
@@ -653,8 +653,8 @@ TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type,
 
   for (CORBA::ULong i = 0; i < ret_len; i++)
     {
-      oid = this->repo_->ir_poa ()->reference_to_id (contents[i],
-                                                     ACE_TRY_ENV);
+      oid = this->repo_->ir_poa ()->reference_to_id (contents[i]
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       contained_path =
@@ -665,14 +665,14 @@ TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type,
                                            contained_key,
                                            0);
 
-      impl = 
-        this->repo_->servant_factory ()->create_contained (contained_key,
-                                                           ACE_TRY_ENV);
+      impl =
+        this->repo_->servant_factory ()->create_contained (contained_key
+                                                           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       auto_ptr<TAO_Contained_i> safety (impl);
 
-      desc = impl->describe_i (ACE_TRY_ENV);
+      desc = impl->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       retval[i].contained_object =
@@ -689,35 +689,35 @@ TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type,
 CORBA_ModuleDef_ptr
 TAO_Container_i::create_module (const char *id,
                                 const char *name,
-                                const char *version,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                const char *version
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_ModuleDef::_nil ());
 
   return this->create_module_i (id,
                                 name,
-                                version,
-                                ACE_TRY_ENV);
+                                version
+                                TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ModuleDef_ptr
 TAO_Container_i::create_module_i (const char *id,
                                   const char *name,
-                                  const char *version,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  const char *version
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Module,
-                                                   ACE_TRY_ENV);
+  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Module
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ModuleDef::_nil ());
 
   if (!legal_op)
     return CORBA_ModuleDef::_nil ();
 
   CORBA::Boolean bad_params = this->pre_exist (id,
-                                               name,
-                                               ACE_TRY_ENV);
+                                               name
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ModuleDef::_nil ());
 
   if (bad_params)
@@ -751,12 +751,12 @@ TAO_Container_i::create_module_i (const char *id,
   // Create the object reference.
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Module,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ModuleDef::_nil ());
 
-  return CORBA_ModuleDef::_narrow (obj.in (),
-                                   ACE_TRY_ENV);
+  return CORBA_ModuleDef::_narrow (obj.in ()
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ConstantDef_ptr
@@ -764,8 +764,8 @@ TAO_Container_i::create_constant (const char *id,
                                   const char *name,
                                   const char *version,
                                   CORBA_IDLType_ptr type,
-                                  const CORBA::Any &value,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  const CORBA::Any &value
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_ConstantDef::_nil ());
@@ -774,8 +774,8 @@ TAO_Container_i::create_constant (const char *id,
                                   name,
                                   version,
                                   type,
-                                  value,
-                                  ACE_TRY_ENV);
+                                  value
+                                  TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ConstantDef_ptr
@@ -783,20 +783,20 @@ TAO_Container_i::create_constant_i (const char *id,
                                     const char *name,
                                     const char *version,
                                     CORBA_IDLType_ptr type,
-                                    const CORBA::Any &value,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    const CORBA::Any &value
+                                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Constant,
-                                                   ACE_TRY_ENV);
+  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Constant
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ());
 
   if (!legal_op)
     return CORBA_ConstantDef::_nil ();
 
   CORBA::Boolean bad_params = this->pre_exist (id,
-                                               name,
-                                               ACE_TRY_ENV);
+                                               name
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ());
 
   if (bad_params)
@@ -822,8 +822,8 @@ TAO_Container_i::create_constant_i (const char *id,
 
   // Get the path to our type and store it.
   PortableServer::ObjectId_var oid =
-    this->repo_->ir_poa ()->reference_to_id (type,
-                                             ACE_TRY_ENV);
+    this->repo_->ir_poa ()->reference_to_id (type
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ());
 
   CORBA::String_var type_path =
@@ -838,7 +838,7 @@ TAO_Container_i::create_constant_i (const char *id,
 
   CORBA::TypeCode_var val_tc = value.type ();
 
-  CORBA::TCKind kind = val_tc->kind (ACE_TRY_ENV);
+  CORBA::TCKind kind = val_tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ());
 
   switch (kind)
@@ -868,20 +868,20 @@ TAO_Container_i::create_constant_i (const char *id,
   // Create the object reference.
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Constant,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ());
 
-  return CORBA_ConstantDef::_narrow (obj.in (),
-                                     ACE_TRY_ENV);
+  return CORBA_ConstantDef::_narrow (obj.in ()
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_StructDef_ptr
 TAO_Container_i::create_struct (const char *id,
                                 const char *name,
                                 const char *version,
-                                const CORBA_StructMemberSeq &members,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                const CORBA_StructMemberSeq &members
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_StructDef::_nil ());
@@ -889,28 +889,28 @@ TAO_Container_i::create_struct (const char *id,
   return this->create_struct_i (id,
                                 name,
                                 version,
-                                members,
-                                ACE_TRY_ENV);
+                                members
+                                TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_StructDef_ptr
 TAO_Container_i::create_struct_i (const char *id,
                                   const char *name,
                                   const char *version,
-                                  const CORBA_StructMemberSeq &members,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  const CORBA_StructMemberSeq &members
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Struct,
-                                                   ACE_TRY_ENV);
+  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Struct
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_StructDef::_nil ());
 
   if (!legal_op)
     return CORBA_StructDef::_nil ();
 
   CORBA::Boolean bad_params = this->pre_exist (id,
-                                               name,
-                                               ACE_TRY_ENV);
+                                               name
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_StructDef::_nil ());
 
   if (bad_params)
@@ -962,8 +962,8 @@ TAO_Container_i::create_struct_i (const char *id,
                                                 members[i].name.in ());
 
       PortableServer::ObjectId_var oid =
-        this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in (),
-                                                 ACE_TRY_ENV);
+        this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in ()
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_StructDef::_nil ());
 
       CORBA::String_var member_path =
@@ -974,7 +974,7 @@ TAO_Container_i::create_struct_i (const char *id,
                                                 member_path.in ());
     }
 
-  CORBA::DefinitionKind def_kind = this->def_kind (ACE_TRY_ENV);
+  CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_StructDef::_nil ());
 
   if (def_kind == CORBA::dk_Struct
@@ -988,12 +988,12 @@ TAO_Container_i::create_struct_i (const char *id,
   // Create the object reference.
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Struct,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_StructDef::_nil ());
 
-  return CORBA_StructDef::_narrow (obj.in (),
-                                   ACE_TRY_ENV);
+  return CORBA_StructDef::_narrow (obj.in ()
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_UnionDef_ptr
@@ -1001,8 +1001,8 @@ TAO_Container_i::create_union (const char *id,
                                const char *name,
                                const char *version,
                                CORBA_IDLType_ptr discriminator_type,
-                               const CORBA_UnionMemberSeq &members,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               const CORBA_UnionMemberSeq &members
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_UnionDef::_nil ());
@@ -1011,8 +1011,8 @@ TAO_Container_i::create_union (const char *id,
                                name,
                                version,
                                discriminator_type,
-                               members,
-                               ACE_TRY_ENV);
+                               members
+                               TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_UnionDef_ptr
@@ -1020,20 +1020,20 @@ TAO_Container_i::create_union_i (const char *id,
                                  const char *name,
                                  const char *version,
                                  CORBA_IDLType_ptr discriminator_type,
-                                 const CORBA_UnionMemberSeq &members,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 const CORBA_UnionMemberSeq &members
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Union,
-                                                   ACE_TRY_ENV);
+  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Union
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_UnionDef::_nil ());
 
   if (!legal_op)
     return CORBA_UnionDef::_nil ();
 
   CORBA::Boolean bad_params = this->pre_exist (id,
-                                               name,
-                                               ACE_TRY_ENV);
+                                               name
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_UnionDef::_nil ());
 
   if (bad_params)
@@ -1058,8 +1058,8 @@ TAO_Container_i::create_union_i (const char *id,
 
   // Add a field to hold the path to the discriminator type.
   PortableServer::ObjectId_var oid =
-    this->repo_->ir_poa ()->reference_to_id (discriminator_type,
-                                             ACE_TRY_ENV);
+    this->repo_->ir_poa ()->reference_to_id (discriminator_type
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_UnionDef::_nil ());
 
   CORBA::String_var disc_path =
@@ -1098,8 +1098,8 @@ TAO_Container_i::create_union_i (const char *id,
                                                 members[i].name.in ());
 
       PortableServer::ObjectId_var oid =
-        this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in (),
-                                                 ACE_TRY_ENV);
+        this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in ()
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_UnionDef::_nil ());
 
       CORBA::String_var member_path =
@@ -1110,11 +1110,11 @@ TAO_Container_i::create_union_i (const char *id,
                                                 member_path.in ());
 
       this->store_label (member_key,
-                         members[i].label,
-                         ACE_TRY_ENV);
+                         members[i].label
+                         TAO_ENV_ARG_PARAMETER);
     }
 
-  CORBA::DefinitionKind def_kind = this->def_kind (ACE_TRY_ENV);
+  CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_UnionDef::_nil ());
 
   if (def_kind == CORBA::dk_Struct
@@ -1128,20 +1128,20 @@ TAO_Container_i::create_union_i (const char *id,
   // Create the object reference.
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Union,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_UnionDef::_nil ());
 
-  return CORBA_UnionDef::_narrow (obj.in (),
-                                  ACE_TRY_ENV);
+  return CORBA_UnionDef::_narrow (obj.in ()
+                                  TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_EnumDef_ptr
 TAO_Container_i::create_enum (const char *id,
                               const char *name,
                               const char *version,
-                              const CORBA_EnumMemberSeq &members,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              const CORBA_EnumMemberSeq &members
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_EnumDef::_nil ());
@@ -1149,28 +1149,28 @@ TAO_Container_i::create_enum (const char *id,
   return this->create_enum_i (id,
                               name,
                               version,
-                              members,
-                              ACE_TRY_ENV);
+                              members
+                              TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_EnumDef_ptr
 TAO_Container_i::create_enum_i (const char *id,
                                 const char *name,
                                 const char *version,
-                                const CORBA_EnumMemberSeq &members,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                const CORBA_EnumMemberSeq &members
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Enum,
-                                                   ACE_TRY_ENV);
+  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Enum
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_EnumDef::_nil ());
 
   if (!legal_op)
     return CORBA_EnumDef::_nil ();
 
   CORBA::Boolean bad_params = this->pre_exist (id,
-                                               name,
-                                               ACE_TRY_ENV);
+                                               name
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_EnumDef::_nil ());
 
   if (bad_params)
@@ -1215,7 +1215,7 @@ TAO_Container_i::create_enum_i (const char *id,
                                                 members[i].in ());
     }
 
-  CORBA::DefinitionKind def_kind = this->def_kind (ACE_TRY_ENV);
+  CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_EnumDef::_nil ());
 
   if (def_kind == CORBA::dk_Struct
@@ -1229,20 +1229,20 @@ TAO_Container_i::create_enum_i (const char *id,
   // Create the object reference.
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Enum,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_EnumDef::_nil ());
 
-  return CORBA_EnumDef::_narrow (obj.in (),
-                                 ACE_TRY_ENV);
+  return CORBA_EnumDef::_narrow (obj.in ()
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_AliasDef_ptr
 TAO_Container_i::create_alias (const char *id,
                                const char *name,
                                const char *version,
-                               CORBA_IDLType_ptr original_type,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA_IDLType_ptr original_type
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_AliasDef::_nil ());
@@ -1250,28 +1250,28 @@ TAO_Container_i::create_alias (const char *id,
   return this->create_alias_i (id,
                                name,
                                version,
-                               original_type,
-                               ACE_TRY_ENV);
+                               original_type
+                               TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_AliasDef_ptr
 TAO_Container_i::create_alias_i (const char *id,
                                  const char *name,
                                  const char *version,
-                                 CORBA_IDLType_ptr original_type,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CORBA_IDLType_ptr original_type
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Alias,
-                                                   ACE_TRY_ENV);
+  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Alias
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AliasDef::_nil ());
 
   if (!legal_op)
     return CORBA_AliasDef::_nil ();
 
   CORBA::Boolean bad_params = this->pre_exist (id,
-                                               name,
-                                               ACE_TRY_ENV);
+                                               name
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AliasDef::_nil ());
 
   if (bad_params)
@@ -1296,8 +1296,8 @@ TAO_Container_i::create_alias_i (const char *id,
 
   // Get the path to our original type and store it.
   PortableServer::ObjectId_var oid =
-    this->repo_->ir_poa ()->reference_to_id (original_type,
-                                             ACE_TRY_ENV);
+    this->repo_->ir_poa ()->reference_to_id (original_type
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AliasDef::_nil ());
 
   CORBA::String_var unalias_path =
@@ -1310,20 +1310,20 @@ TAO_Container_i::create_alias_i (const char *id,
   // Create the object reference.
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Alias,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AliasDef::_nil ());
 
-  return CORBA_AliasDef::_narrow (obj.in (),
-                                  ACE_TRY_ENV);
+  return CORBA_AliasDef::_narrow (obj.in ()
+                                  TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_InterfaceDef_ptr
 TAO_Container_i::create_interface (const char *id,
                                    const char *name,
                                    const char *version,
-                                   const CORBA_InterfaceDefSeq &base_interfaces,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   const CORBA_InterfaceDefSeq &base_interfaces
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_InterfaceDef::_nil ());
@@ -1331,28 +1331,28 @@ TAO_Container_i::create_interface (const char *id,
   return this->create_interface_i (id,
                                    name,
                                    version,
-                                   base_interfaces,
-                                   ACE_TRY_ENV);
+                                   base_interfaces
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_InterfaceDef_ptr
 TAO_Container_i::create_interface_i (const char *id,
                                      const char *name,
                                      const char *version,
-                                     const CORBA_InterfaceDefSeq &base_interfaces,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     const CORBA_InterfaceDefSeq &base_interfaces
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Interface,
-                                                   ACE_TRY_ENV);
+  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Interface
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ());
 
   if (!legal_op)
     return CORBA_InterfaceDef::_nil ();
 
   CORBA::Boolean bad_params = this->pre_exist (id,
-                                               name,
-                                               ACE_TRY_ENV);
+                                               name
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ());
 
   if (bad_params)
@@ -1391,8 +1391,8 @@ TAO_Container_i::create_interface_i (const char *id,
       for (CORBA::ULong i = 0; i < length; i++)
         {
           PortableServer::ObjectId_var oid =
-            this->repo_->ir_poa ()->reference_to_id (base_interfaces[i],
-                                                     ACE_TRY_ENV);
+            this->repo_->ir_poa ()->reference_to_id (base_interfaces[i]
+                                                     TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ());
 
           CORBA::String_var inherited_path =
@@ -1409,12 +1409,12 @@ TAO_Container_i::create_interface_i (const char *id,
   // Create the object reference.
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Interface,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ());
 
-  return CORBA_InterfaceDef::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+  return CORBA_InterfaceDef::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ValueDef_ptr
@@ -1427,8 +1427,8 @@ TAO_Container_i::create_value (const char *id,
                                CORBA::Boolean is_truncatable,
                                const CORBA_ValueDefSeq &abstract_base_values,
                                const CORBA_InterfaceDefSeq &supported_interfaces,
-                               const CORBA_InitializerSeq &initializers,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               const CORBA_InitializerSeq &initializers
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_ValueDef::_nil ());
@@ -1442,8 +1442,8 @@ TAO_Container_i::create_value (const char *id,
                                is_truncatable,
                                abstract_base_values,
                                supported_interfaces,
-                               initializers,
-                               ACE_TRY_ENV);
+                               initializers
+                               TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ValueDef_ptr
@@ -1456,8 +1456,8 @@ TAO_Container_i::create_value_i (const char * /* id */,
                                  CORBA::Boolean /* is_truncatable */,
                                  const CORBA_ValueDefSeq & /* abstract_base_values */,
                                  const CORBA_InterfaceDefSeq & /* supported_interfaces */,
-                                 const CORBA_InitializerSeq & /* initializers */,
-                                 CORBA::Environment & /* ACE_TRY_ENV */)
+                                 const CORBA_InitializerSeq & /* initializers */
+                                 TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -1468,8 +1468,8 @@ CORBA_ValueBoxDef_ptr
 TAO_Container_i::create_value_box (const char *id,
                                    const char *name,
                                    const char *version,
-                                   CORBA_IDLType_ptr original_type_def,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   CORBA_IDLType_ptr original_type_def
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_ValueBoxDef::_nil ());
@@ -1477,28 +1477,28 @@ TAO_Container_i::create_value_box (const char *id,
   return this->create_value_box_i (id,
                                    name,
                                    version,
-                                   original_type_def,
-                                   ACE_TRY_ENV);
+                                   original_type_def
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ValueBoxDef_ptr
 TAO_Container_i::create_value_box_i (const char *id,
                                      const char *name,
                                      const char *version,
-                                     CORBA_IDLType_ptr original_type_def,
-                                     CORBA::Environment &ACE_TRY_ENV )
+                                     CORBA_IDLType_ptr original_type_def
+                                     TAO_ENV_ARG_DECL )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_ValueBox,
-                                                   ACE_TRY_ENV);
+  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_ValueBox
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ());
 
   if (!legal_op)
     return CORBA_ValueBoxDef::_nil ();
 
   CORBA::Boolean bad_params = this->pre_exist (id,
-                                               name,
-                                               ACE_TRY_ENV);
+                                               name
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ());
 
   if (bad_params)
@@ -1523,8 +1523,8 @@ TAO_Container_i::create_value_box_i (const char *id,
 
   // Get the path to our original type and store it.
   PortableServer::ObjectId_var oid =
-    this->repo_->ir_poa ()->reference_to_id (original_type_def,
-                                             ACE_TRY_ENV);
+    this->repo_->ir_poa ()->reference_to_id (original_type_def
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ());
 
   CORBA::String_var boxed_path =
@@ -1537,20 +1537,20 @@ TAO_Container_i::create_value_box_i (const char *id,
   // Create the object reference.
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_ValueBox,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ());
 
-  return CORBA_ValueBoxDef::_narrow (obj.in (),
-                                     ACE_TRY_ENV);
+  return CORBA_ValueBoxDef::_narrow (obj.in ()
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ExceptionDef_ptr
 TAO_Container_i::create_exception (const char *id,
                                    const char *name,
                                    const char *version,
-                                   const CORBA_StructMemberSeq &members,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   const CORBA_StructMemberSeq &members
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_ExceptionDef::_nil ());
@@ -1558,28 +1558,28 @@ TAO_Container_i::create_exception (const char *id,
   return this->create_exception_i (id,
                                    name,
                                    version,
-                                   members,
-                                   ACE_TRY_ENV);
+                                   members
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ExceptionDef_ptr
 TAO_Container_i::create_exception_i (const char *id,
                                      const char *name,
                                      const char *version,
-                                     const CORBA_StructMemberSeq &members,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     const CORBA_StructMemberSeq &members
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Exception,
-                                                   ACE_TRY_ENV);
+  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Exception
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ());
 
   if (!legal_op)
     return CORBA_ExceptionDef::_nil ();
 
   CORBA::Boolean bad_params = this->pre_exist (id,
-                                               name,
-                                               ACE_TRY_ENV);
+                                               name
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ());
 
   if (bad_params)
@@ -1629,8 +1629,8 @@ TAO_Container_i::create_exception_i (const char *id,
                                                 members[i].name.in ());
 
       PortableServer::ObjectId_var oid =
-        this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in (),
-                                                 ACE_TRY_ENV);
+        this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in ()
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ());
 
       CORBA::String_var member_path =
@@ -1644,46 +1644,46 @@ TAO_Container_i::create_exception_i (const char *id,
   // Create the object reference.
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Exception,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ());
 
-  return CORBA_ExceptionDef::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+  return CORBA_ExceptionDef::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_NativeDef_ptr
 TAO_Container_i::create_native (const char *id,
                                 const char *name,
-                                const char *version,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                const char *version
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_NativeDef::_nil ());
 
   return this->create_native_i (id,
                                 name,
-                                version,
-                                ACE_TRY_ENV);
+                                version
+                                TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_NativeDef_ptr
 TAO_Container_i::create_native_i (const char *id,
                                   const char *name,
-                                  const char *version,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  const char *version
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Native,
-                                                   ACE_TRY_ENV);
+  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Native
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_NativeDef::_nil ());
 
   if (!legal_op)
     return CORBA_NativeDef::_nil ();
 
   CORBA::Boolean bad_params = this->pre_exist (id,
-                                               name,
-                                               ACE_TRY_ENV);
+                                               name
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_NativeDef::_nil ());
 
   if (bad_params)
@@ -1709,12 +1709,12 @@ TAO_Container_i::create_native_i (const char *id,
   // Create the object reference.
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Native,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_NativeDef::_nil ());
 
-  return CORBA_NativeDef::_narrow (obj.in (),
-                                   ACE_TRY_ENV);
+  return CORBA_NativeDef::_narrow (obj.in ()
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_AbstractInterfaceDef_ptr
@@ -1722,8 +1722,8 @@ TAO_Container_i::create_abstract_interface (
     const char *id,
     const char *name,
     const char *version,
-    const CORBA_AbstractInterfaceDefSeq &base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq &base_interfaces
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1732,8 +1732,8 @@ TAO_Container_i::create_abstract_interface (
   return this->create_abstract_interface_i (id,
                                             name,
                                             version,
-                                            base_interfaces,
-                                            ACE_TRY_ENV);
+                                            base_interfaces
+                                            TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_AbstractInterfaceDef_ptr
@@ -1741,14 +1741,14 @@ TAO_Container_i::create_abstract_interface_i (
     const char *id,
     const char *name,
     const char *version,
-    const CORBA_AbstractInterfaceDefSeq &base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq &base_interfaces
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean legal_op = this->valid_container (
-      CORBA::dk_AbstractInterface,
-      ACE_TRY_ENV
+      CORBA::dk_AbstractInterface
+      TAO_ENV_ARG_PARAMETER
     );
   ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ());
 
@@ -1756,8 +1756,8 @@ TAO_Container_i::create_abstract_interface_i (
     return CORBA_AbstractInterfaceDef::_nil ();
 
   CORBA::Boolean bad_params = this->pre_exist (id,
-                                               name,
-                                               ACE_TRY_ENV);
+                                               name
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ());
 
   if (bad_params)
@@ -1796,8 +1796,8 @@ TAO_Container_i::create_abstract_interface_i (
       for (CORBA::ULong i = 0; i < length; i++)
         {
           PortableServer::ObjectId_var oid =
-            this->repo_->ir_poa ()->reference_to_id (base_interfaces[i],
-                                                     ACE_TRY_ENV);
+            this->repo_->ir_poa ()->reference_to_id (base_interfaces[i]
+                                                     TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ());
 
           CORBA::String_var inherited_path =
@@ -1814,12 +1814,12 @@ TAO_Container_i::create_abstract_interface_i (
   // Create the object reference.
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_AbstractInterface,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ());
 
-  return CORBA_AbstractInterfaceDef::_narrow (obj.in (),
-                                              ACE_TRY_ENV);
+  return CORBA_AbstractInterfaceDef::_narrow (obj.in ()
+                                              TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_LocalInterfaceDef_ptr
@@ -1827,8 +1827,8 @@ TAO_Container_i::create_local_interface (
     const char *id,
     const char *name,
     const char *version,
-    const CORBA_InterfaceDefSeq &base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq &base_interfaces
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1837,8 +1837,8 @@ TAO_Container_i::create_local_interface (
   return this->create_local_interface_i (id,
                                          name,
                                          version,
-                                         base_interfaces,
-                                         ACE_TRY_ENV);
+                                         base_interfaces
+                                         TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_LocalInterfaceDef_ptr
@@ -1846,21 +1846,21 @@ TAO_Container_i::create_local_interface_i (
     const char *id,
     const char *name,
     const char *version,
-    const CORBA_InterfaceDefSeq &base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq &base_interfaces
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_LocalInterface,
-                                                   ACE_TRY_ENV);
+  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_LocalInterface
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ());
 
   if (!legal_op)
     return CORBA_LocalInterfaceDef::_nil ();
 
   CORBA::Boolean bad_params = this->pre_exist (id,
-                                               name,
-                                               ACE_TRY_ENV);
+                                               name
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ());
 
   if (bad_params)
@@ -1899,8 +1899,8 @@ TAO_Container_i::create_local_interface_i (
       for (CORBA::ULong i = 0; i < length; i++)
         {
           PortableServer::ObjectId_var oid =
-            this->repo_->ir_poa ()->reference_to_id (base_interfaces[i],
-                                                     ACE_TRY_ENV);
+            this->repo_->ir_poa ()->reference_to_id (base_interfaces[i]
+                                                     TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ());
 
           CORBA::String_var inherited_path =
@@ -1917,17 +1917,17 @@ TAO_Container_i::create_local_interface_i (
   // Create the object reference.
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_LocalInterface,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ());
 
-  return CORBA_LocalInterfaceDef::_narrow (obj.in (),
-                                           ACE_TRY_ENV);
+  return CORBA_LocalInterfaceDef::_narrow (obj.in ()
+                                           TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
-TAO_Container_i::name_exists (const char *name,
-                              CORBA::Environment &ACE_TRY_ENV)
+TAO_Container_i::name_exists (const char *name
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int index = 0;
@@ -2003,7 +2003,7 @@ TAO_Container_i::name_exists (const char *name,
     }
 
   // If we are an interface, check the inherited members.
-  CORBA::DefinitionKind def_kind = this->def_kind (ACE_TRY_ENV);
+  CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (1);
 
   if (def_kind == CORBA::dk_Interface)
@@ -2059,8 +2059,8 @@ TAO_Container_i::lookup_name_recursive (
       const char *search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL
     )
 {
   ACE_Configuration_Section_Key defns_key;
@@ -2124,8 +2124,8 @@ TAO_Container_i::lookup_name_recursive (
             {
               TAO_Container_i *impl =
                 this->repo_->servant_factory ()->create_container (
-                                                     defn_key,
-                                                     ACE_TRY_ENV
+                                                     defn_key
+                                                     TAO_ENV_ARG_PARAMETER
                                                    );
               ACE_CHECK;
 
@@ -2142,14 +2142,14 @@ TAO_Container_i::lookup_name_recursive (
                                               ? -1
                                               : levels_to_search - 1,
                                            limit_type,
-                                           exclude_inherited,
-                                           ACE_TRY_ENV);
+                                           exclude_inherited
+                                           TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
     }
 
-  CORBA::DefinitionKind kind = this->def_kind (ACE_TRY_ENV);
+  CORBA::DefinitionKind kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (kind == CORBA::dk_Interface || kind == CORBA::dk_Value)
@@ -2377,8 +2377,8 @@ TAO_Container_i::lookup_op (
 }
 
 CORBA::Boolean
-TAO_Container_i::id_exists (const char *id,
-                            CORBA::Environment &ACE_TRY_ENV)
+TAO_Container_i::id_exists (const char *id
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The repo id must not already exist.
@@ -2399,17 +2399,17 @@ TAO_Container_i::id_exists (const char *id,
 
 CORBA::Boolean
 TAO_Container_i::pre_exist (const char *id,
-                            const char *name,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            const char *name
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean exist = this->id_exists (id, ACE_TRY_ENV);
+  CORBA::Boolean exist = this->id_exists (id TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (1);
 
   if (exist)
     return 1;
 
-  return name_exists (name, ACE_TRY_ENV);
+  return name_exists (name TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_TString
@@ -2515,11 +2515,11 @@ TAO_Container_i::create_common (
 }
 
 CORBA::Boolean
-TAO_Container_i::valid_container (const CORBA::DefinitionKind op_kind,
-                                  CORBA::Environment &ACE_TRY_ENV)
+TAO_Container_i::valid_container (const CORBA::DefinitionKind op_kind
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::DefinitionKind my_kind = this->def_kind (ACE_TRY_ENV);
+  CORBA::DefinitionKind my_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   int error_flag = 0;
@@ -2578,13 +2578,13 @@ TAO_Container_i::valid_container (const CORBA::DefinitionKind op_kind,
 
 void
 TAO_Container_i::store_label (ACE_Configuration_Section_Key key,
-                              const CORBA::Any &value,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              const CORBA::Any &value
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::TypeCode_var tc = value.type ();
 
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
+  CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_InputCDR cdr (value._tao_get_cdr (),
diff --git a/TAO/orbsvcs/IFR_Service/Container_i.h b/TAO/orbsvcs/IFR_Service/Container_i.h
index a23a0fb3526..df454997d72 100644
--- a/TAO/orbsvcs/IFR_Service/Container_i.h
+++ b/TAO/orbsvcs/IFR_Service/Container_i.h
@@ -42,7 +42,7 @@ class TAO_Container_i : public virtual TAO_IRObject_i
   //
   // = DESCRIPTION
   //    Abstract base class used to form a containment hierarchy
-  //    in the Interface Repository, by containing objects 
+  //    in the Interface Repository, by containing objects
   //    derived from the Contained interface.
   //
 public:
@@ -54,102 +54,90 @@ public:
   // Destructor.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove our contents.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained_ptr lookup (
-      const char *search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *search_name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_Contained_ptr lookup_i (
-      const char *search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *search_name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ContainedSeq *contents (
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ContainedSeq *contents_i (
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ContainedSeq *lookup_name (
       const char *search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ContainedSeq *lookup_name_i (
       const char *search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Container::DescriptionSeq *describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Long max_returned_objs
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_Container::DescriptionSeq *describe_contents_i (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Long max_returned_objs
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ModuleDef_ptr create_module (
       const char *id,
       const char *name,
-      const char *version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ModuleDef_ptr create_module_i (
       const char *id,
       const char *name,
-      const char *version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ConstantDef_ptr create_constant (
@@ -157,10 +145,9 @@ public:
       const char *name,
       const char *version,
       CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ConstantDef_ptr create_constant_i (
@@ -168,30 +155,27 @@ public:
       const char *name,
       const char *version,
       CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_StructDef_ptr create_struct (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA_StructMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_StructDef_ptr create_struct_i (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA_StructMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_UnionDef_ptr create_union (
@@ -199,10 +183,9 @@ public:
       const char *name,
       const char *version,
       CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_UnionDef_ptr create_union_i (
@@ -210,70 +193,63 @@ public:
       const char *name,
       const char *version,
       CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_EnumDef_ptr create_enum (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA_EnumMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_EnumDef_ptr create_enum_i (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA_EnumMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_AliasDef_ptr create_alias (
       const char *id,
       const char *name,
       const char *version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_AliasDef_ptr create_alias_i (
       const char *id,
       const char *name,
       const char *version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_InterfaceDef_ptr create_interface (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA_InterfaceDefSeq &base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq &base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_InterfaceDef_ptr create_interface_i (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA_InterfaceDefSeq &base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq &base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ValueDef_ptr create_value (
@@ -286,10 +262,9 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA_ValueDefSeq &abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq &initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq &initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ValueDef_ptr create_value_i (
@@ -302,134 +277,120 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA_ValueDefSeq &abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq &initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq &initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ValueBoxDef_ptr create_value_box (
       const char *id,
       const char *name,
       const char *version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ValueBoxDef_ptr create_value_box_i (
       const char *id,
       const char *name,
       const char *version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ExceptionDef_ptr create_exception (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA_StructMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ExceptionDef_ptr create_exception_i (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA_StructMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_NativeDef_ptr create_native (
       const char *id,
       const char *name,
-      const char *version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_NativeDef_ptr create_native_i (
       const char *id,
       const char *name,
-      const char *version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA_AbstractInterfaceDefSeq &base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_AbstractInterfaceDefSeq &base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_AbstractInterfaceDef_ptr create_abstract_interface_i (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA_AbstractInterfaceDefSeq &base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_AbstractInterfaceDefSeq &base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA_InterfaceDefSeq &base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq &base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_LocalInterfaceDef_ptr create_local_interface_i (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA_InterfaceDefSeq &base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq &base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean name_exists (
-      const char *name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Checks for local existence of <name>.
-                  
+
 protected:
    void store_label (
       ACE_Configuration_Section_Key key,
-      const CORBA::Any &value,                           
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any &value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Store a union member's label value.
 
   CORBA::Boolean pre_exist (
       const char *id,
-      const char *name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Bundles id_exists and name_exists together.
 
@@ -465,24 +426,21 @@ private:
       const char *search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   CORBA::Boolean id_exists (
-      const char *id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Checks for global existence of the repo id.
 
   CORBA::Boolean valid_container (
-      const CORBA::DefinitionKind op_kind,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::DefinitionKind op_kind
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Is this operation valid for this container type?
 
diff --git a/TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp b/TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp
index bdcd681fa01..eac6599262e 100644
--- a/TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp
@@ -19,39 +19,39 @@ TAO_EmitsDef_i::~TAO_EmitsDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_EmitsDef_i::def_kind (CORBA::Environment &)
+TAO_EmitsDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Emits;
 }
 
 void 
-TAO_EmitsDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_EmitsDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void 
-TAO_EmitsDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_EmitsDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_EmitsDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_EmitsDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_EmitsDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_EmitsDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/EmitsDef_i.h b/TAO/orbsvcs/IFR_Service/EmitsDef_i.h
index e58f8327ffc..4759d541ab8 100644
--- a/TAO/orbsvcs/IFR_Service/EmitsDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/EmitsDef_i.h
@@ -51,36 +51,31 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 };
diff --git a/TAO/orbsvcs/IFR_Service/EnumDef_i.cpp b/TAO/orbsvcs/IFR_Service/EnumDef_i.cpp
index 901c4f331fe..04ab433cb5b 100644
--- a/TAO/orbsvcs/IFR_Service/EnumDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/EnumDef_i.cpp
@@ -21,23 +21,23 @@ TAO_EnumDef_i::~TAO_EnumDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_EnumDef_i::def_kind (CORBA::Environment &)
+TAO_EnumDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Enum;
 }
 
-CORBA::TypeCode_ptr 
-TAO_EnumDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_EnumDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_EnumDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_EnumDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -50,26 +50,26 @@ TAO_EnumDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
                                             "name",
                                             name);
 
-  CORBA_EnumMemberSeq_var members = this->members_i (ACE_TRY_ENV);
+  CORBA_EnumMemberSeq_var members = this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return this->repo_->tc_factory ()->create_enum_tc (id.c_str (),
                                                      name.c_str (),
-                                                     members.in (),
-                                                     ACE_TRY_ENV);
+                                                     members.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_EnumMemberSeq *
-TAO_EnumDef_i::members (CORBA::Environment &ACE_TRY_ENV)
+TAO_EnumDef_i::members (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->members_i (ACE_TRY_ENV);
+  return this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_EnumMemberSeq *
-TAO_EnumDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_EnumDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int count = 0;
@@ -105,20 +105,20 @@ TAO_EnumDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
   return retval;
 }
 
-void 
-TAO_EnumDef_i::members (const CORBA_EnumMemberSeq &members,
-                        CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_EnumDef_i::members (const CORBA_EnumMemberSeq &members
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->members_i (members,
-                   ACE_TRY_ENV);
+  this->members_i (members
+                   TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_EnumDef_i::members_i (const CORBA_EnumMemberSeq &members,
-                          CORBA::Environment &)
+void
+TAO_EnumDef_i::members_i (const CORBA_EnumMemberSeq &members
+                          TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
diff --git a/TAO/orbsvcs/IFR_Service/EnumDef_i.h b/TAO/orbsvcs/IFR_Service/EnumDef_i.h
index 1ff7447416c..ba0aefb5c6f 100644
--- a/TAO/orbsvcs/IFR_Service/EnumDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/EnumDef_i.h
@@ -51,50 +51,43 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA_EnumMemberSeq *members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_EnumMemberSeq *members_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void members (
-      const CORBA_EnumMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void members_i (
-      const CORBA_EnumMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/EventDef_i.cpp b/TAO/orbsvcs/IFR_Service/EventDef_i.cpp
index 3e270a16914..b7e4549e081 100644
--- a/TAO/orbsvcs/IFR_Service/EventDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/EventDef_i.cpp
@@ -17,70 +17,70 @@ TAO_EventDef_i::~TAO_EventDef_i (void)
 {
 }
 
-void 
-TAO_EventDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_EventDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_EventDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_EventDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_EventDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_EventDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_EventDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_EventDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-CORBA::Boolean 
-TAO_EventDef_i::is_a (const char *event_id,
-                      CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_EventDef_i::is_a (const char *event_id
+                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->is_a_i (event_id,
-                       ACE_TRY_ENV);
+  return this->is_a_i (event_id
+                       TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA::Boolean 
-TAO_EventDef_i::is_a_i (const char * /* event_id */,
-                        CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA::Boolean
+TAO_EventDef_i::is_a_i (const char * /* event_id */
+                        TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-CORBA_ValueDef_ptr 
-TAO_EventDef_i::event (CORBA::Environment &ACE_TRY_ENV)
+CORBA_ValueDef_ptr
+TAO_EventDef_i::event (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_ValueDef::_nil ());
 
-  return this->event_i (ACE_TRY_ENV);
+  return this->event_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_ValueDef_ptr 
-TAO_EventDef_i::event_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA_ValueDef_ptr
+TAO_EventDef_i::event_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/EventDef_i.h b/TAO/orbsvcs/IFR_Service/EventDef_i.h
index 091f5fb5afe..e86186fc725 100644
--- a/TAO/orbsvcs/IFR_Service/EventDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/EventDef_i.h
@@ -51,56 +51,48 @@ public:
   // Destructor
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::Boolean is_a (
-      const char *event_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *event_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
-      const char *event_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *event_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ValueDef_ptr event (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ValueDef_ptr event_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp b/TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp
index cb6db156611..3bffdcc71d6 100644
--- a/TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp
@@ -24,45 +24,45 @@ TAO_ExceptionDef_i::~TAO_ExceptionDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ExceptionDef_i::def_kind (CORBA::Environment &)
+TAO_ExceptionDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Exception;
 }
 
-void 
-TAO_ExceptionDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ExceptionDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_ExceptionDef_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ExceptionDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our members.
-  TAO_Container_i::destroy_i (ACE_TRY_ENV);
+  TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-    
+
   // Destroy ourself.
-  TAO_Contained_i::destroy_i (ACE_TRY_ENV);
+  TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA_Contained::Description *
-TAO_ExceptionDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_ExceptionDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_ExceptionDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_ExceptionDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_Contained::Description *desc_ptr = 0;
@@ -73,15 +73,15 @@ TAO_ExceptionDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
 
   CORBA_Contained::Description_var retval = desc_ptr;
 
-  retval->kind = this->def_kind (ACE_TRY_ENV);
+  retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA_ExceptionDescription ed;
 
-  ed.name = this->name_i (ACE_TRY_ENV);
+  ed.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  ed.id = this->id_i (ACE_TRY_ENV);
+  ed.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_TString container_id;
@@ -92,10 +92,10 @@ TAO_ExceptionDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
 
   ed.defined_in = container_id.c_str ();
 
-  ed.version = this->version_i (ACE_TRY_ENV);
+  ed.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  ed.type = this->type_i (ACE_TRY_ENV);
+  ed.type = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   retval->value <<= ed;
@@ -103,17 +103,17 @@ TAO_ExceptionDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
   return retval._retn ();
 }
 
-CORBA::TypeCode_ptr 
-TAO_ExceptionDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_ExceptionDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_ExceptionDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_ExceptionDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -126,26 +126,26 @@ TAO_ExceptionDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
                                             "name",
                                             name);
 
-  CORBA_StructMemberSeq_var members = this->members_i (ACE_TRY_ENV);
+  CORBA_StructMemberSeq_var members = this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return this->repo_->tc_factory ()->create_exception_tc (id.c_str (),
                                                           name.c_str (),
-                                                          members.in (),
-                                                          ACE_TRY_ENV);
+                                                          members.in ()
+                                                          TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_StructMemberSeq *
-TAO_ExceptionDef_i::members (CORBA::Environment &ACE_TRY_ENV)
+TAO_ExceptionDef_i::members (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->members_i (ACE_TRY_ENV);
+  return this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_StructMemberSeq *
-TAO_ExceptionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_ExceptionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue;
@@ -201,7 +201,7 @@ TAO_ExceptionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
                                                      "def_kind",
                                                      kind);
 
-          CORBA::DefinitionKind def_kind = 
+          CORBA::DefinitionKind def_kind =
             ACE_static_cast (CORBA::DefinitionKind, kind);
 
           kind_queue.enqueue_tail (def_kind);
@@ -209,7 +209,7 @@ TAO_ExceptionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
     }
 
   size_t size = kind_queue.size ();
-                    
+
   CORBA_StructMemberSeq *members = 0;
   ACE_NEW_THROW_EX (members,
                     CORBA_StructMemberSeq (size),
@@ -237,14 +237,14 @@ TAO_ExceptionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
 
       path_queue.dequeue_head (path);
 
-      obj = 
+      obj =
         this->repo_->servant_factory ()->create_objref (kind,
-                                                        path.c_str (),
-                                                        ACE_TRY_ENV);
+                                                        path.c_str ()
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
-    
-      retval[k].type_def = CORBA_IDLType::_narrow (obj.in (),
-                                                   ACE_TRY_ENV);
+
+      retval[k].type_def = CORBA_IDLType::_narrow (obj.in ()
+                                                   TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       this->repo_->config ()->expand_path (this->repo_->root_key (),
@@ -253,37 +253,37 @@ TAO_ExceptionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
                                            0);
 
       impl =
-        this->repo_->servant_factory ()->create_idltype (member_key,
-                                                         ACE_TRY_ENV);
+        this->repo_->servant_factory ()->create_idltype (member_key
+                                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       auto_ptr<TAO_IDLType_i> safety (impl);
-    
-      retval[k].type = impl->type_i (ACE_TRY_ENV);
+
+      retval[k].type = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
   return retval._retn ();
 }
 
-void 
-TAO_ExceptionDef_i::members (const CORBA_StructMemberSeq &members,
-                             CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ExceptionDef_i::members (const CORBA_StructMemberSeq &members
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->members_i (members,
-                   ACE_TRY_ENV);
+  this->members_i (members
+                   TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_ExceptionDef_i::members_i (const CORBA_StructMemberSeq &members,
-                               CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ExceptionDef_i::members_i (const CORBA_StructMemberSeq &members
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our old members, both refs and defns.
-  TAO_Container_i::destroy_i (ACE_TRY_ENV);
+  TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong count = members.length ();
@@ -315,9 +315,9 @@ TAO_ExceptionDef_i::members_i (const CORBA_StructMemberSeq &members,
                                                     "name",
                                                     name);
 
-          PortableServer::ObjectId_var oid = 
-            this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in (),
-                                                     ACE_TRY_ENV);
+          PortableServer::ObjectId_var oid =
+            this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           CORBA::String_var path =
diff --git a/TAO/orbsvcs/IFR_Service/ExceptionDef_i.h b/TAO/orbsvcs/IFR_Service/ExceptionDef_i.h
index bade27d5c42..0a1d55cad82 100644
--- a/TAO/orbsvcs/IFR_Service/ExceptionDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/ExceptionDef_i.h
@@ -34,7 +34,7 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_ExceptionDef_i : public virtual TAO_Contained_i, 
+class TAO_ExceptionDef_i : public virtual TAO_Contained_i,
                            public virtual TAO_Container_i
 {
   // = TITLE
@@ -52,76 +52,65 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_StructMemberSeq *members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_StructMemberSeq *members_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void members (
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void members_i (
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp b/TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp
index 9f967d089eb..597ad4f0235 100644
--- a/TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp
@@ -21,39 +21,39 @@ TAO_FactoryDef_i::~TAO_FactoryDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_FactoryDef_i::def_kind (CORBA::Environment &)
+TAO_FactoryDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Factory;
 }
 
 void 
-TAO_FactoryDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_FactoryDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void 
-TAO_FactoryDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_FactoryDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_FactoryDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_FactoryDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_FactoryDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */ )
+TAO_FactoryDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/FactoryDef_i.h b/TAO/orbsvcs/IFR_Service/FactoryDef_i.h
index 12cdb254fbc..09718358b0c 100644
--- a/TAO/orbsvcs/IFR_Service/FactoryDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/FactoryDef_i.h
@@ -50,36 +50,31 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 };
diff --git a/TAO/orbsvcs/IFR_Service/FinderDef_i.cpp b/TAO/orbsvcs/IFR_Service/FinderDef_i.cpp
index 88e363a16f5..a8a16e4178b 100644
--- a/TAO/orbsvcs/IFR_Service/FinderDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/FinderDef_i.cpp
@@ -19,39 +19,39 @@ TAO_FinderDef_i::~TAO_FinderDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_FinderDef_i::def_kind (CORBA::Environment &)
+TAO_FinderDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Finder;
 }
 
 void 
-TAO_FinderDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_FinderDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void 
-TAO_FinderDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_FinderDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_FinderDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_FinderDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_FinderDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */ )
+TAO_FinderDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/FinderDef_i.h b/TAO/orbsvcs/IFR_Service/FinderDef_i.h
index 34b1cc78c93..ea9d60edcfa 100644
--- a/TAO/orbsvcs/IFR_Service/FinderDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/FinderDef_i.h
@@ -50,36 +50,31 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 };
diff --git a/TAO/orbsvcs/IFR_Service/FixedDef_i.cpp b/TAO/orbsvcs/IFR_Service/FixedDef_i.cpp
index af5b9736b21..42ccaf54ec2 100644
--- a/TAO/orbsvcs/IFR_Service/FixedDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/FixedDef_i.cpp
@@ -18,112 +18,112 @@ TAO_FixedDef_i::~TAO_FixedDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_FixedDef_i::def_kind (CORBA::Environment &)
+TAO_FixedDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Fixed;
 }
 
-void 
-TAO_FixedDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_FixedDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_FixedDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_FixedDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
-CORBA::TypeCode_ptr 
-TAO_FixedDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_FixedDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_FixedDef_i::type_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA::TypeCode_ptr
+TAO_FixedDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-CORBA::UShort 
-TAO_FixedDef_i::digits (CORBA::Environment &ACE_TRY_ENV)
+CORBA::UShort
+TAO_FixedDef_i::digits (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->digits_i (ACE_TRY_ENV);
+  return this->digits_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::UShort 
-TAO_FixedDef_i::digits_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA::UShort
+TAO_FixedDef_i::digits_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-void 
-TAO_FixedDef_i::digits (CORBA::UShort digits,
-                        CORBA::Environment & ACE_TRY_ENV)
+void
+TAO_FixedDef_i::digits (CORBA::UShort digits
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->digits_i (digits,
-                  ACE_TRY_ENV);
+  this->digits_i (digits
+                  TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_FixedDef_i::digits_i (CORBA::UShort /* digits */,
-                          CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_FixedDef_i::digits_i (CORBA::UShort /* digits */
+                          TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
-CORBA::Short 
-TAO_FixedDef_i::scale (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Short
+TAO_FixedDef_i::scale (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->scale_i (ACE_TRY_ENV);
+  return this->scale_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::Short 
-TAO_FixedDef_i::scale_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA::Short
+TAO_FixedDef_i::scale_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-void 
-TAO_FixedDef_i::scale (CORBA::Short scale,
-                       CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_FixedDef_i::scale (CORBA::Short scale
+                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->scale_i (scale,
-                 ACE_TRY_ENV);
+  this->scale_i (scale
+                 TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_FixedDef_i::scale_i (CORBA::Short /* scale */,
-                       CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_FixedDef_i::scale_i (CORBA::Short /* scale */
+                       TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/FixedDef_i.h b/TAO/orbsvcs/IFR_Service/FixedDef_i.h
index 4f2537801eb..6ea79f0cc0b 100644
--- a/TAO/orbsvcs/IFR_Service/FixedDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/FixedDef_i.h
@@ -50,89 +50,76 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::UShort digits (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::UShort digits_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void digits (
-      CORBA::UShort digits,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::UShort digits
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void digits_i (
-      CORBA::UShort digits,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::UShort digits
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Short scale (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Short scale_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void scale (
-      CORBA::Short scale,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Short scale
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void scale_i (
-      CORBA::Short scale,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Short scale
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/HomeDef_i.cpp b/TAO/orbsvcs/IFR_Service/HomeDef_i.cpp
index fb6cd59071a..77617ed7ab9 100644
--- a/TAO/orbsvcs/IFR_Service/HomeDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/HomeDef_i.cpp
@@ -21,107 +21,107 @@ TAO_HomeDef_i::~TAO_HomeDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_HomeDef_i::def_kind (CORBA::Environment &)
+TAO_HomeDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Home;
 }
 
-void 
-TAO_HomeDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_HomeDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_HomeDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_HomeDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_HomeDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_HomeDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_HomeDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_HomeDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-CORBA::TypeCode_ptr 
-TAO_HomeDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_HomeDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_HomeDef_i::type_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA::TypeCode_ptr
+TAO_HomeDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-IR::HomeDef_ptr 
-TAO_HomeDef_i::base_home (CORBA::Environment &ACE_TRY_ENV)
+IR::HomeDef_ptr
+TAO_HomeDef_i::base_home (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (IR::HomeDef::_nil ());
 
-  return this->base_home_i (ACE_TRY_ENV);
+  return this->base_home_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-IR::HomeDef_ptr 
-TAO_HomeDef_i::base_home_i (CORBA::Environment & /* ACE_TRY_ENV */)
+IR::HomeDef_ptr
+TAO_HomeDef_i::base_home_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-IR::ComponentDef_ptr 
-TAO_HomeDef_i::managed_component (CORBA::Environment &ACE_TRY_ENV)
+IR::ComponentDef_ptr
+TAO_HomeDef_i::managed_component (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (IR::ComponentDef::_nil ());
 
-  return this->managed_component_i (ACE_TRY_ENV);
+  return this->managed_component_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-IR::ComponentDef_ptr 
-TAO_HomeDef_i::managed_component_i (CORBA::Environment & /* ACE_TRY_ENV */)
+IR::ComponentDef_ptr
+TAO_HomeDef_i::managed_component_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-IR::PrimaryKeyDef_ptr 
-TAO_HomeDef_i::primary_key (CORBA::Environment &ACE_TRY_ENV)
+IR::PrimaryKeyDef_ptr
+TAO_HomeDef_i::primary_key (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (IR::PrimaryKeyDef::_nil ());
 
-  return this->primary_key_i (ACE_TRY_ENV);
+  return this->primary_key_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-IR::PrimaryKeyDef_ptr 
-TAO_HomeDef_i::primary_key_i (CORBA::Environment & /* ACE_TRY_ENV */)
+IR::PrimaryKeyDef_ptr
+TAO_HomeDef_i::primary_key_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -129,16 +129,16 @@ TAO_HomeDef_i::primary_key_i (CORBA::Environment & /* ACE_TRY_ENV */)
 }
 
 IR::FactoryDefSeq *
-TAO_HomeDef_i::factories (CORBA::Environment &ACE_TRY_ENV)
+TAO_HomeDef_i::factories (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->factories_i (ACE_TRY_ENV);
+  return this->factories_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 IR::FactoryDefSeq *
-TAO_HomeDef_i::factories_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_HomeDef_i::factories_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -146,45 +146,45 @@ TAO_HomeDef_i::factories_i (CORBA::Environment & /* ACE_TRY_ENV */)
 }
 
 IR::FinderDefSeq *
-TAO_HomeDef_i::finders (CORBA::Environment &ACE_TRY_ENV)
+TAO_HomeDef_i::finders (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->finders_i (ACE_TRY_ENV);
+  return this->finders_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 IR::FinderDefSeq *
-TAO_HomeDef_i::finders_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_HomeDef_i::finders_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-CORBA::Boolean 
-TAO_HomeDef_i::is_basic (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_HomeDef_i::is_basic (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->is_basic_i (ACE_TRY_ENV);
+  return this->is_basic_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::Boolean 
-TAO_HomeDef_i::is_basic_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA::Boolean
+TAO_HomeDef_i::is_basic_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-IR::PrimaryKeyDef_ptr 
+IR::PrimaryKeyDef_ptr
 TAO_HomeDef_i::create_primary_key (const char *id,
                                    const char *name,
                                    const char *version,
-                                   CORBA_ValueDef_ptr primary_key,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   CORBA_ValueDef_ptr primary_key
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (IR::PrimaryKeyDef::_nil ());
@@ -192,29 +192,29 @@ TAO_HomeDef_i::create_primary_key (const char *id,
   return this->create_primary_key_i (id,
                                      name,
                                      version,
-                                     primary_key,
-                                     ACE_TRY_ENV);
+                                     primary_key
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
-IR::PrimaryKeyDef_ptr 
+IR::PrimaryKeyDef_ptr
 TAO_HomeDef_i::create_primary_key_i (const char * /* id */,
                                      const char * /* name */,
                                      const char * /* version */,
-                                     CORBA_ValueDef_ptr /* primary_key */,
-                                     CORBA::Environment & /* ACE_TRY_ENV */)
+                                     CORBA_ValueDef_ptr /* primary_key */
+                                     TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-IR::FactoryDef_ptr 
+IR::FactoryDef_ptr
 TAO_HomeDef_i::create_factory (const char *id,
                                const char *name,
                                const char *version,
                                const CORBA_ParDescriptionSeq &params,
-                               const CORBA_ExceptionDefSeq &exceptions,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               const CORBA_ExceptionDefSeq &exceptions
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (IR::FactoryDef::_nil ());
@@ -223,18 +223,18 @@ TAO_HomeDef_i::create_factory (const char *id,
                                  name,
                                  version,
                                  params,
-                                 exceptions,
-                                 ACE_TRY_ENV);
+                                 exceptions
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
-IR::FactoryDef_ptr 
+IR::FactoryDef_ptr
 TAO_HomeDef_i::create_factory_i (
     const char * /* id */,
     const char * /* name */,
     const char * /* version */,
     const CORBA_ParDescriptionSeq & /* params */,
-    const CORBA_ExceptionDefSeq & /* exceptions */,
-    CORBA::Environment & /* ACE_TRY_ENV */
+    const CORBA_ExceptionDefSeq & /* exceptions */
+    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -242,13 +242,13 @@ TAO_HomeDef_i::create_factory_i (
   return 0;
 }
 
-IR::FinderDef_ptr 
+IR::FinderDef_ptr
 TAO_HomeDef_i::create_finder (const char *id,
                               const char *name,
                               const char *version,
                               const CORBA_ParDescriptionSeq &params,
-                              const CORBA_ExceptionDefSeq &exceptions,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              const CORBA_ExceptionDefSeq &exceptions
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (IR::FinderDef::_nil ());
@@ -257,18 +257,18 @@ TAO_HomeDef_i::create_finder (const char *id,
                                 name,
                                 version,
                                 params,
-                                exceptions,
-                                ACE_TRY_ENV);
+                                exceptions
+                                TAO_ENV_ARG_PARAMETER);
 }
 
-IR::FinderDef_ptr 
+IR::FinderDef_ptr
 TAO_HomeDef_i::create_finder_i (
     const char * /* id */,
     const char * /* name */,
     const char * /* version */,
     const CORBA_ParDescriptionSeq & /* params */,
-    const CORBA_ExceptionDefSeq & /* exceptions */,
-    CORBA::Environment & /* ACE_TRY_ENV */
+    const CORBA_ExceptionDefSeq & /* exceptions */
+    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
diff --git a/TAO/orbsvcs/IFR_Service/HomeDef_i.h b/TAO/orbsvcs/IFR_Service/HomeDef_i.h
index ad2f96d4b10..473bf92c399 100644
--- a/TAO/orbsvcs/IFR_Service/HomeDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/HomeDef_i.h
@@ -49,146 +49,125 @@ public:
   // Constructor
 
   virtual ~TAO_HomeDef_i (void);
-  // Destructor  
+  // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual IR::HomeDef_ptr base_home (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::HomeDef_ptr base_home_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::ComponentDef_ptr managed_component (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::ComponentDef_ptr managed_component_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::PrimaryKeyDef_ptr primary_key (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::PrimaryKeyDef_ptr primary_key_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::FactoryDefSeq *factories (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::FactoryDefSeq *factories_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::FinderDefSeq *finders (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::FinderDefSeq *finders_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_basic (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_basic_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::PrimaryKeyDef_ptr create_primary_key (
       const char *id,
       const char *name,
       const char *version,
-      CORBA_ValueDef_ptr primary_key,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_ValueDef_ptr primary_key
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::PrimaryKeyDef_ptr create_primary_key_i (
       const char *id,
       const char *name,
       const char *version,
-      CORBA_ValueDef_ptr primary_key,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_ValueDef_ptr primary_key
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::FactoryDef_ptr create_factory (
@@ -196,10 +175,9 @@ public:
       const char *name,
       const char *version,
       const CORBA_ParDescriptionSeq &params,
-      const CORBA_ExceptionDefSeq &exceptions,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ExceptionDefSeq &exceptions
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::FactoryDef_ptr create_factory_i (
@@ -207,10 +185,9 @@ public:
       const char *name,
       const char *version,
       const CORBA_ParDescriptionSeq &params,
-      const CORBA_ExceptionDefSeq &exceptions,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ExceptionDefSeq &exceptions
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::FinderDef_ptr create_finder (
@@ -218,10 +195,9 @@ public:
       const char *name,
       const char *version,
       const CORBA_ParDescriptionSeq &params,
-      const CORBA_ExceptionDefSeq &exceptions,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ExceptionDefSeq &exceptions
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::FinderDef_ptr create_finder_i (
@@ -229,10 +205,9 @@ public:
       const char *name,
       const char *version,
       const CORBA_ParDescriptionSeq &params,
-      const CORBA_ExceptionDefSeq &exceptions,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ExceptionDefSeq &exceptions
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/IDLType_i.h b/TAO/orbsvcs/IFR_Service/IDLType_i.h
index 521fdcef356..3090d1cf163 100644
--- a/TAO/orbsvcs/IFR_Service/IDLType_i.h
+++ b/TAO/orbsvcs/IFR_Service/IDLType_i.h
@@ -54,16 +54,14 @@ public:
   // Destructor.
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Defined in concrete classes.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Defined in concrete classes.
 };
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp b/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp
index 7e55a1c3994..571fa45f9c4 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp
@@ -162,36 +162,32 @@ public:
   TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_IRObject *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::DefinitionKind result);
@@ -208,45 +204,45 @@ private:
 TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_IRObject *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_IRObject *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -258,7 +254,7 @@ TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -267,11 +263,11 @@ TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -287,36 +283,32 @@ public:
   TAO_ServerRequestInfo_CORBA_IRObject_destroy (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_IRObject *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -332,45 +324,45 @@ private:
 TAO_ServerRequestInfo_CORBA_IRObject_destroy::TAO_ServerRequestInfo_CORBA_IRObject_destroy (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_IRObject *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_IRObject *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_IRObject_destroy::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_IRObject_destroy::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_IRObject_destroy::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_IRObject_destroy::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_IRObject_destroy::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_IRObject_destroy::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -378,7 +370,7 @@ TAO_ServerRequestInfo_CORBA_IRObject_destroy::result (CORBA::Environment &ACE_TR
 
 char *
 TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -387,11 +379,11 @@ TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -423,18 +415,18 @@ _TAO_CORBA_IRObject_Strategized_Proxy_Broker::~_TAO_CORBA_IRObject_Strategized_P
 
 _TAO_CORBA_IRObject_Proxy_Impl&
 _TAO_CORBA_IRObject_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_IRObject *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_IRObject *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -443,8 +435,8 @@ _TAO_CORBA_IRObject_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_IRObject_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -513,8 +505,8 @@ _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::_TAO_CORBA_IRObject_ThruPOA_Proxy_Impl (
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::DefinitionKind _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::def_kind (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -529,8 +521,8 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::def_kind (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "def_kind",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -539,13 +531,13 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::def_kind (
           "IDL:omg.org/CORBA/IRObject:1.0"
         )
     )->def_kind (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::destroy (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -558,8 +550,8 @@ void _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::destroy (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "destroy",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -568,7 +560,7 @@ void _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::destroy (
           "IDL:omg.org/CORBA/IRObject:1.0"
         )
     )->destroy (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
   return;
 }
@@ -596,8 +588,8 @@ POA_CORBA_IRObject::~POA_CORBA_IRObject (void)
 void POA_CORBA_IRObject::_get_def_kind_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject *_tao_impl =
@@ -617,19 +609,19 @@ void POA_CORBA_IRObject::_get_def_kind_skel (
   TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->def_kind (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -637,20 +629,20 @@ void POA_CORBA_IRObject::_get_def_kind_skel (
       CORBA::DefinitionKind _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -672,16 +664,13 @@ void POA_CORBA_IRObject::_get_def_kind_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_IRObject::destroy_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject *_tao_impl =
@@ -701,38 +690,38 @@ void POA_CORBA_IRObject::destroy_skel (
   TAO_ServerRequestInfo_CORBA_IRObject_destroy ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->destroy (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -747,16 +736,13 @@ void POA_CORBA_IRObject::destroy_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_IRObject::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -766,7 +752,7 @@ void POA_CORBA_IRObject::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -778,12 +764,12 @@ void POA_CORBA_IRObject::_is_a_skel (
 void POA_CORBA_IRObject::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject *_tao_impl = (POA_CORBA_IRObject *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -795,8 +781,8 @@ void POA_CORBA_IRObject::_non_existent_skel (
 void POA_CORBA_IRObject::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject *_tao_impl = (POA_CORBA_IRObject *) _tao_object_reference;
@@ -815,7 +801,7 @@ void POA_CORBA_IRObject::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -841,11 +827,11 @@ void POA_CORBA_IRObject::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_IRObject::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -867,12 +853,12 @@ void* POA_CORBA_IRObject::_downcast (
   return 0;
 }
 
-void POA_CORBA_IRObject::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_IRObject::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -882,9 +868,9 @@ const char* POA_CORBA_IRObject::_interface_repository_id (void) const
 }
 
 CORBA_IRObject*
-POA_CORBA_IRObject::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_IRObject::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -1049,36 +1035,32 @@ public:
   TAO_ServerRequestInfo_CORBA_Contained_id_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (char * result);
@@ -1095,45 +1077,45 @@ private:
 TAO_ServerRequestInfo_CORBA_Contained_id_get::TAO_ServerRequestInfo_CORBA_Contained_id_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_Contained *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_Contained *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_id_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_id_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_id_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_id_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_id_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_id_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1145,7 +1127,7 @@ TAO_ServerRequestInfo_CORBA_Contained_id_get::result (CORBA::Environment &ACE_TR
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_id_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1154,11 +1136,11 @@ TAO_ServerRequestInfo_CORBA_Contained_id_get::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_id_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1175,36 +1157,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
     ,
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * id
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -1222,8 +1200,8 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::TAO_ServerRequestInfo_CORBA_Contai
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Contained *tao_impl,
-    const char * id,
-    CORBA::Environment &
+    const char * id
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1231,12 +1209,12 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::TAO_ServerRequestInfo_CORBA_Contai
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_id_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_id_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1252,25 +1230,25 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::arguments (CORBA::Environment &ACE
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_id_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_id_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_id_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_id_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -1278,7 +1256,7 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::result (CORBA::Environment &ACE_TR
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_id_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1287,11 +1265,11 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_id_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_Contained_name_get : public TAO_ServerRequestInfo
@@ -1300,36 +1278,32 @@ public:
   TAO_ServerRequestInfo_CORBA_Contained_name_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (char * result);
@@ -1346,45 +1320,45 @@ private:
 TAO_ServerRequestInfo_CORBA_Contained_name_get::TAO_ServerRequestInfo_CORBA_Contained_name_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_Contained *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_Contained *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_name_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_name_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_name_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_name_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_name_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_name_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1396,7 +1370,7 @@ TAO_ServerRequestInfo_CORBA_Contained_name_get::result (CORBA::Environment &ACE_
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_name_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1405,11 +1379,11 @@ TAO_ServerRequestInfo_CORBA_Contained_name_get::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_name_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1426,36 +1400,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
     ,
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * name
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -1473,8 +1443,8 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::TAO_ServerRequestInfo_CORBA_Cont
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Contained *tao_impl,
-    const char * name,
-    CORBA::Environment &
+    const char * name
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1482,12 +1452,12 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::TAO_ServerRequestInfo_CORBA_Cont
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_name_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_name_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1503,25 +1473,25 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::arguments (CORBA::Environment &A
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_name_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_name_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_name_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_name_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -1529,7 +1499,7 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::result (CORBA::Environment &ACE_
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_name_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1538,11 +1508,11 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_name_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_Contained_version_get : public TAO_ServerRequestInfo
@@ -1551,36 +1521,32 @@ public:
   TAO_ServerRequestInfo_CORBA_Contained_version_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (char * result);
@@ -1597,45 +1563,45 @@ private:
 TAO_ServerRequestInfo_CORBA_Contained_version_get::TAO_ServerRequestInfo_CORBA_Contained_version_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_Contained *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_Contained *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_version_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_version_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_version_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_version_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_version_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_version_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1647,7 +1613,7 @@ TAO_ServerRequestInfo_CORBA_Contained_version_get::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_version_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1656,11 +1622,11 @@ TAO_ServerRequestInfo_CORBA_Contained_version_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_version_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1677,36 +1643,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
     ,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * version
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -1724,8 +1686,8 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::TAO_ServerRequestInfo_CORBA_C
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Contained *tao_impl,
-    const char * version,
-    CORBA::Environment &
+    const char * version
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1733,12 +1695,12 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::TAO_ServerRequestInfo_CORBA_C
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_version_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_version_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1754,25 +1716,25 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_version_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_version_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_version_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_version_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -1780,7 +1742,7 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_version_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1789,11 +1751,11 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_version_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_Contained_defined_in_get : public TAO_ServerRequestInfo
@@ -1802,36 +1764,32 @@ public:
   TAO_ServerRequestInfo_CORBA_Contained_defined_in_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_Container_ptr result);
@@ -1848,45 +1806,45 @@ private:
 TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::TAO_ServerRequestInfo_CORBA_Contained_defined_in_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_Contained *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_Contained *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1898,7 +1856,7 @@ TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1907,11 +1865,11 @@ TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::target_most_derived_interf
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1927,36 +1885,32 @@ public:
   TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (char * result);
@@ -1973,45 +1927,45 @@ private:
 TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_Contained *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_Contained *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -2023,7 +1977,7 @@ TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::result (CORBA::Environm
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2032,11 +1986,11 @@ TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::target_most_derived_int
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -2052,36 +2006,32 @@ public:
   TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_Repository_ptr result);
@@ -2098,45 +2048,45 @@ private:
 TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_Contained *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_Contained *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -2148,7 +2098,7 @@ TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::result (CORBA::
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2157,11 +2107,11 @@ TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::target_most_der
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -2177,36 +2127,32 @@ public:
   TAO_ServerRequestInfo_CORBA_Contained_describe (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_Contained::Description * result);
@@ -2223,45 +2169,45 @@ private:
 TAO_ServerRequestInfo_CORBA_Contained_describe::TAO_ServerRequestInfo_CORBA_Contained_describe (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_Contained *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_Contained *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_describe::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_describe::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_describe::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_describe::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_describe::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_describe::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -2273,7 +2219,7 @@ TAO_ServerRequestInfo_CORBA_Contained_describe::result (CORBA::Environment &ACE_
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_describe::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2282,11 +2228,11 @@ TAO_ServerRequestInfo_CORBA_Contained_describe::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_describe::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -2305,36 +2251,32 @@ public:
     ,
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * new_version
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -2356,8 +2298,8 @@ TAO_ServerRequestInfo_CORBA_Contained_move::TAO_ServerRequestInfo_CORBA_Containe
     POA_CORBA_Contained *tao_impl,
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &
+    const char * new_version
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -2367,12 +2309,12 @@ TAO_ServerRequestInfo_CORBA_Contained_move::TAO_ServerRequestInfo_CORBA_Containe
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_move::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_move::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -2394,25 +2336,25 @@ TAO_ServerRequestInfo_CORBA_Contained_move::arguments (CORBA::Environment &ACE_T
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_move::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_move::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_move::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_move::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -2420,7 +2362,7 @@ TAO_ServerRequestInfo_CORBA_Contained_move::result (CORBA::Environment &ACE_TRY_
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_move::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2429,11 +2371,11 @@ TAO_ServerRequestInfo_CORBA_Contained_move::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_move::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -2465,18 +2407,18 @@ _TAO_CORBA_Contained_Strategized_Proxy_Broker::~_TAO_CORBA_Contained_Strategized
 
 _TAO_CORBA_Contained_Proxy_Impl&
 _TAO_CORBA_Contained_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_Contained *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_Contained *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -2485,8 +2427,8 @@ _TAO_CORBA_Contained_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_Contained_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -2555,8 +2497,8 @@ _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
 // ThruPOA Implementation of the IDL interface methods
 
 char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2571,8 +2513,8 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "id",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2581,14 +2523,14 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id (
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->id (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id (
     CORBA_Object *_collocated_tao_target_,
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2601,8 +2543,8 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "id",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2611,15 +2553,15 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id (
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->id (
-        id,
-        ACE_TRY_ENV
+        id
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2634,8 +2576,8 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "name",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2644,14 +2586,14 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name (
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->name (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name (
     CORBA_Object *_collocated_tao_target_,
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2664,8 +2606,8 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "name",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2674,15 +2616,15 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name (
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->name (
-        name,
-        ACE_TRY_ENV
+        name
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2697,8 +2639,8 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "version",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2707,14 +2649,14 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version (
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->version (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version (
     CORBA_Object *_collocated_tao_target_,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2727,8 +2669,8 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "version",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2737,15 +2679,15 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version (
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->version (
-        version,
-        ACE_TRY_ENV
+        version
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA_Container_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::defined_in (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2760,8 +2702,8 @@ CORBA_Container_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::defined_in (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "defined_in",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2770,13 +2712,13 @@ CORBA_Container_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::defined_in (
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->defined_in (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::absolute_name (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2791,8 +2733,8 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::absolute_name (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "absolute_name",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2801,13 +2743,13 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::absolute_name (
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->absolute_name (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_Repository_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::containing_repository (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2822,8 +2764,8 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::containing_reposit
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "containing_repository",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2832,13 +2774,13 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::containing_reposit
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->containing_repository (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_Contained::Description * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::describe (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2853,8 +2795,8 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::describe
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "describe",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2863,7 +2805,7 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::describe
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->describe (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -2871,8 +2813,8 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::move (
     CORBA_Object *_collocated_tao_target_,
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2885,8 +2827,8 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::move (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "move",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2897,8 +2839,8 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::move (
     )->move (
         new_container,
         new_name,
-        new_version,
-        ACE_TRY_ENV
+        new_version
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -2927,8 +2869,8 @@ POA_CORBA_Contained::~POA_CORBA_Contained (void)
 void POA_CORBA_Contained::_get_id_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained *_tao_impl =
@@ -2948,19 +2890,19 @@ void POA_CORBA_Contained::_get_id_skel (
   TAO_ServerRequestInfo_CORBA_Contained_id_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->id (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2969,20 +2911,20 @@ void POA_CORBA_Contained::_get_id_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3004,16 +2946,13 @@ void POA_CORBA_Contained::_get_id_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Contained::_set_id_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3041,39 +2980,39 @@ void POA_CORBA_Contained::_set_id_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      id.in (),
-      ACE_TRY_ENV
+      id.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->id (
-          id.in (),
-          ACE_TRY_ENV
+          id.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3088,16 +3027,13 @@ void POA_CORBA_Contained::_set_id_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Contained::_get_name_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained *_tao_impl =
@@ -3117,19 +3053,19 @@ void POA_CORBA_Contained::_get_name_skel (
   TAO_ServerRequestInfo_CORBA_Contained_name_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->name (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -3138,20 +3074,20 @@ void POA_CORBA_Contained::_get_name_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3173,16 +3109,13 @@ void POA_CORBA_Contained::_get_name_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Contained::_set_name_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3210,39 +3143,39 @@ void POA_CORBA_Contained::_set_name_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      name.in (),
-      ACE_TRY_ENV
+      name.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->name (
-          name.in (),
-          ACE_TRY_ENV
+          name.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3257,16 +3190,13 @@ void POA_CORBA_Contained::_set_name_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Contained::_get_version_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained *_tao_impl =
@@ -3286,19 +3216,19 @@ void POA_CORBA_Contained::_get_version_skel (
   TAO_ServerRequestInfo_CORBA_Contained_version_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->version (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -3307,20 +3237,20 @@ void POA_CORBA_Contained::_get_version_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3342,16 +3272,13 @@ void POA_CORBA_Contained::_get_version_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Contained::_set_version_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3379,39 +3306,39 @@ void POA_CORBA_Contained::_set_version_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      version.in (),
-      ACE_TRY_ENV
+      version.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->version (
-          version.in (),
-          ACE_TRY_ENV
+          version.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3426,16 +3353,13 @@ void POA_CORBA_Contained::_set_version_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Contained::_get_defined_in_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained *_tao_impl =
@@ -3455,19 +3379,19 @@ void POA_CORBA_Contained::_get_defined_in_skel (
   TAO_ServerRequestInfo_CORBA_Contained_defined_in_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->defined_in (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -3476,20 +3400,20 @@ void POA_CORBA_Contained::_get_defined_in_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3511,16 +3435,13 @@ void POA_CORBA_Contained::_get_defined_in_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Contained::_get_absolute_name_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained *_tao_impl =
@@ -3540,19 +3461,19 @@ void POA_CORBA_Contained::_get_absolute_name_skel (
   TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->absolute_name (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -3561,20 +3482,20 @@ void POA_CORBA_Contained::_get_absolute_name_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3596,16 +3517,13 @@ void POA_CORBA_Contained::_get_absolute_name_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Contained::_get_containing_repository_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained *_tao_impl =
@@ -3625,19 +3543,19 @@ void POA_CORBA_Contained::_get_containing_repository_skel (
   TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->containing_repository (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -3646,20 +3564,20 @@ void POA_CORBA_Contained::_get_containing_repository_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3681,16 +3599,13 @@ void POA_CORBA_Contained::_get_containing_repository_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Contained::describe_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained *_tao_impl =
@@ -3710,19 +3625,19 @@ void POA_CORBA_Contained::describe_skel (
   TAO_ServerRequestInfo_CORBA_Contained_describe ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->describe (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -3731,20 +3646,20 @@ void POA_CORBA_Contained::describe_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3766,16 +3681,13 @@ void POA_CORBA_Contained::describe_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Contained::move_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3809,13 +3721,13 @@ void POA_CORBA_Contained::move_skel (
       _tao_impl,
       new_container.in (),
       new_name.in (),
-      new_version.in (),
-      ACE_TRY_ENV
+      new_version.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -3823,27 +3735,27 @@ void POA_CORBA_Contained::move_skel (
       _tao_impl->move (
           new_container.in (),
           new_name.in (),
-          new_version.in (),
-          ACE_TRY_ENV
+          new_version.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3858,16 +3770,13 @@ void POA_CORBA_Contained::move_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Contained::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3877,7 +3786,7 @@ void POA_CORBA_Contained::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -3889,12 +3798,12 @@ void POA_CORBA_Contained::_is_a_skel (
 void POA_CORBA_Contained::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained *_tao_impl = (POA_CORBA_Contained *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -3906,8 +3815,8 @@ void POA_CORBA_Contained::_non_existent_skel (
 void POA_CORBA_Contained::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained *_tao_impl = (POA_CORBA_Contained *) _tao_object_reference;
@@ -3926,7 +3835,7 @@ void POA_CORBA_Contained::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -3952,11 +3861,11 @@ void POA_CORBA_Contained::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_Contained::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -3981,12 +3890,12 @@ void* POA_CORBA_Contained::_downcast (
   return 0;
 }
 
-void POA_CORBA_Contained::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_Contained::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -3996,9 +3905,9 @@ const char* POA_CORBA_Contained::_interface_repository_id (void) const
 }
 
 CORBA_Contained*
-POA_CORBA_Contained::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_Contained::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -4170,36 +4079,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Container *tao_impl
     ,
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * search_name
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_Contained_ptr result);
@@ -4218,8 +4123,8 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::TAO_ServerRequestInfo_CORBA_Contai
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Container *tao_impl,
-    const char * search_name,
-    CORBA::Environment &
+    const char * search_name
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4227,12 +4132,12 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::TAO_ServerRequestInfo_CORBA_Contai
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_lookup::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_lookup::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4248,25 +4153,25 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::arguments (CORBA::Environment &ACE
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_lookup::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_lookup::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_lookup::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_lookup::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4278,7 +4183,7 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::result (CORBA::Environment &ACE_TR
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_lookup::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4287,11 +4192,11 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_lookup::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4309,36 +4214,32 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Container *tao_impl
     ,
     CORBA::DefinitionKind & limit_type,
-    const CORBA::Boolean & exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::Boolean & exclude_inherited
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ContainedSeq * result);
@@ -4359,8 +4260,8 @@ TAO_ServerRequestInfo_CORBA_Container_contents::TAO_ServerRequestInfo_CORBA_Cont
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Container *tao_impl,
     CORBA::DefinitionKind & limit_type,
-    const CORBA::Boolean & exclude_inherited,
-    CORBA::Environment &
+    const CORBA::Boolean & exclude_inherited
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4369,12 +4270,12 @@ TAO_ServerRequestInfo_CORBA_Container_contents::TAO_ServerRequestInfo_CORBA_Cont
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_contents::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_contents::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4393,25 +4294,25 @@ TAO_ServerRequestInfo_CORBA_Container_contents::arguments (CORBA::Environment &A
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_contents::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_contents::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_contents::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_contents::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4423,7 +4324,7 @@ TAO_ServerRequestInfo_CORBA_Container_contents::result (CORBA::Environment &ACE_
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_contents::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4432,11 +4333,11 @@ TAO_ServerRequestInfo_CORBA_Container_contents::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_contents::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4456,36 +4357,32 @@ public:
     const char * search_name,
     const CORBA::Long & levels_to_search,
     CORBA::DefinitionKind & limit_type,
-    const CORBA::Boolean & exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::Boolean & exclude_inherited
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ContainedSeq * result);
@@ -4510,8 +4407,8 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::TAO_ServerRequestInfo_CORBA_C
     const char * search_name,
     const CORBA::Long & levels_to_search,
     CORBA::DefinitionKind & limit_type,
-    const CORBA::Boolean & exclude_inherited,
-    CORBA::Environment &
+    const CORBA::Boolean & exclude_inherited
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4522,12 +4419,12 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::TAO_ServerRequestInfo_CORBA_C
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_lookup_name::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_lookup_name::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4552,25 +4449,25 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_lookup_name::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_lookup_name::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_lookup_name::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_lookup_name::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4582,7 +4479,7 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_lookup_name::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4591,11 +4488,11 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_lookup_name::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4614,36 +4511,32 @@ public:
     ,
     CORBA::DefinitionKind & limit_type,
     const CORBA::Boolean & exclude_inherited,
-    const CORBA::Long & max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::Long & max_returned_objs
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_Container::DescriptionSeq * result);
@@ -4666,8 +4559,8 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::TAO_ServerRequestInfo_C
     POA_CORBA_Container *tao_impl,
     CORBA::DefinitionKind & limit_type,
     const CORBA::Boolean & exclude_inherited,
-    const CORBA::Long & max_returned_objs,
-    CORBA::Environment &
+    const CORBA::Long & max_returned_objs
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4677,12 +4570,12 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::TAO_ServerRequestInfo_C
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_describe_contents::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_describe_contents::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4704,25 +4597,25 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::arguments (CORBA::Envir
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_describe_contents::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_describe_contents::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_describe_contents::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_describe_contents::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4734,7 +4627,7 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::result (CORBA::Environm
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_describe_contents::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4743,11 +4636,11 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::target_most_derived_int
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_describe_contents::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4766,36 +4659,32 @@ public:
     ,
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * version
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ModuleDef_ptr result);
@@ -4818,8 +4707,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::TAO_ServerRequestInfo_CORBA
     POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &
+    const char * version
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4829,12 +4718,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::TAO_ServerRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_module::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_module::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4856,25 +4745,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::arguments (CORBA::Environme
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_module::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_module::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_module::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_module::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4886,7 +4775,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_module::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4895,11 +4784,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::target_most_derived_interfa
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_module::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4920,36 +4809,32 @@ public:
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ConstantDef_ptr result);
@@ -4976,8 +4861,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::TAO_ServerRequestInfo_COR
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4989,12 +4874,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::TAO_ServerRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_constant::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_constant::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5022,25 +4907,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_constant::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_constant::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_constant::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_constant::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5052,7 +4937,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_constant::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5061,11 +4946,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_constant::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5085,36 +4970,32 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_StructDef_ptr result);
@@ -5139,8 +5020,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::TAO_ServerRequestInfo_CORBA
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5151,12 +5032,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::TAO_ServerRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_struct::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_struct::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5181,25 +5062,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::arguments (CORBA::Environme
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_struct::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_struct::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_struct::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_struct::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5211,7 +5092,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_struct::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5220,11 +5101,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::target_most_derived_interfa
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_struct::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5245,36 +5126,32 @@ public:
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_UnionDef_ptr result);
@@ -5301,8 +5178,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::TAO_ServerRequestInfo_CORBA_
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5314,12 +5191,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::TAO_ServerRequestInfo_CORBA_
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_union::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_union::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5347,25 +5224,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::arguments (CORBA::Environmen
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_union::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_union::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_union::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_union::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5377,7 +5254,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::result (CORBA::Environment &
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_union::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5386,11 +5263,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::target_most_derived_interfac
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_union::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5410,36 +5287,32 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_EnumDef_ptr result);
@@ -5464,8 +5337,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::TAO_ServerRequestInfo_CORBA_C
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5476,12 +5349,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::TAO_ServerRequestInfo_CORBA_C
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_enum::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_enum::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5506,25 +5379,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_enum::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_enum::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_enum::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_enum::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5536,7 +5409,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_enum::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5545,11 +5418,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_enum::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5569,36 +5442,32 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_AliasDef_ptr result);
@@ -5623,8 +5492,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::TAO_ServerRequestInfo_CORBA_
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5635,12 +5504,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::TAO_ServerRequestInfo_CORBA_
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_alias::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_alias::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5665,25 +5534,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::arguments (CORBA::Environmen
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_alias::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_alias::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_alias::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_alias::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5695,7 +5564,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::result (CORBA::Environment &
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_alias::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5704,11 +5573,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::target_most_derived_interfac
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_alias::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5728,36 +5597,32 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_InterfaceDef_ptr result);
@@ -5782,8 +5647,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::TAO_ServerRequestInfo_CO
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5794,12 +5659,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::TAO_ServerRequestInfo_CO
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_interface::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_interface::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5824,25 +5689,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::arguments (CORBA::Enviro
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_interface::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_interface::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_interface::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_interface::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5854,7 +5719,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::result (CORBA::Environme
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_interface::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5863,11 +5728,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::target_most_derived_inte
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_interface::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5893,36 +5758,32 @@ public:
     const CORBA::Boolean & is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ValueDef_ptr result);
@@ -5959,8 +5820,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::TAO_ServerRequestInfo_CORBA_
     const CORBA::Boolean & is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5977,12 +5838,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::TAO_ServerRequestInfo_CORBA_
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_value::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_value::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6025,25 +5886,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::arguments (CORBA::Environmen
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_value::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_value::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_value::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_value::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6055,7 +5916,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::result (CORBA::Environment &
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_value::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6064,11 +5925,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::target_most_derived_interfac
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_value::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6088,36 +5949,32 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ValueBoxDef_ptr result);
@@ -6142,8 +5999,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::TAO_ServerRequestInfo_CO
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6154,12 +6011,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::TAO_ServerRequestInfo_CO
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_value_box::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_value_box::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6184,25 +6041,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::arguments (CORBA::Enviro
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_value_box::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_value_box::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_value_box::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_value_box::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6214,7 +6071,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::result (CORBA::Environme
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_value_box::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6223,11 +6080,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::target_most_derived_inte
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_value_box::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6247,36 +6104,32 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ExceptionDef_ptr result);
@@ -6301,8 +6154,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::TAO_ServerRequestInfo_CO
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6313,12 +6166,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::TAO_ServerRequestInfo_CO
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_exception::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_exception::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6343,25 +6196,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::arguments (CORBA::Enviro
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_exception::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_exception::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_exception::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_exception::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6373,7 +6226,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::result (CORBA::Environme
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_exception::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6382,11 +6235,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::target_most_derived_inte
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_exception::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6405,36 +6258,32 @@ public:
     ,
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * version
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_NativeDef_ptr result);
@@ -6457,8 +6306,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::TAO_ServerRequestInfo_CORBA
     POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &
+    const char * version
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6468,12 +6317,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::TAO_ServerRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_native::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_native::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6495,25 +6344,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::arguments (CORBA::Environme
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_native::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_native::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_native::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_native::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6525,7 +6374,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_native::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6534,11 +6383,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::target_most_derived_interfa
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_native::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6558,36 +6407,32 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_AbstractInterfaceDef_ptr result);
@@ -6612,8 +6457,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::TAO_ServerReque
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6624,12 +6469,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::TAO_ServerReque
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6654,25 +6499,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::arguments (CORB
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6684,7 +6529,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::result (CORBA::
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6693,11 +6538,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::target_most_der
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6717,36 +6562,32 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_LocalInterfaceDef_ptr result);
@@ -6771,8 +6612,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::TAO_ServerRequestI
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6783,12 +6624,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::TAO_ServerRequestI
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_local_interface::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_local_interface::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6813,25 +6654,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::arguments (CORBA::
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_local_interface::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_local_interface::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_local_interface::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_local_interface::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6843,7 +6684,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::result (CORBA::Env
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_local_interface::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6852,11 +6693,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::target_most_derive
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_local_interface::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6895,18 +6736,18 @@ _TAO_CORBA_Container_Strategized_Proxy_Broker::~_TAO_CORBA_Container_Strategized
 
 _TAO_CORBA_Container_Proxy_Impl&
 _TAO_CORBA_Container_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_Container *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_Container *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -6915,8 +6756,8 @@ _TAO_CORBA_Container_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_Container_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -6986,8 +6827,8 @@ _TAO_CORBA_Container_ThruPOA_Proxy_Impl::_TAO_CORBA_Container_ThruPOA_Proxy_Impl
 
 CORBA_Contained_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup (
     CORBA_Object *_collocated_tao_target_,
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7002,8 +6843,8 @@ CORBA_Contained_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "lookup",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7012,16 +6853,16 @@ CORBA_Contained_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup (
           "IDL:omg.org/CORBA/Container:1.0"
         )
     )->lookup (
-        search_name,
-        ACE_TRY_ENV
+        search_name
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::contents (
     CORBA_Object *_collocated_tao_target_,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7036,8 +6877,8 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::contents (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "contents",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7047,8 +6888,8 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::contents (
         )
     )->contents (
         limit_type,
-        exclude_inherited,
-        ACE_TRY_ENV
+        exclude_inherited
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7057,8 +6898,8 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup_name (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7073,8 +6914,8 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup_name (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "lookup_name",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7086,8 +6927,8 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup_name (
         search_name,
         levels_to_search,
         limit_type,
-        exclude_inherited,
-        ACE_TRY_ENV
+        exclude_inherited
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7095,8 +6936,8 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::descr
     CORBA_Object *_collocated_tao_target_,
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Long max_returned_objs
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7111,8 +6952,8 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::descr
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "describe_contents",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7123,8 +6964,8 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::descr
     )->describe_contents (
         limit_type,
         exclude_inherited,
-        max_returned_objs,
-        ACE_TRY_ENV
+        max_returned_objs
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7132,8 +6973,8 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_module (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7148,8 +6989,8 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_module (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_module",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7160,8 +7001,8 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_module (
     )->create_module (
         id,
         name,
-        version,
-        ACE_TRY_ENV
+        version
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7171,8 +7012,8 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_constant (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7187,8 +7028,8 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_constant (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_constant",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7201,8 +7042,8 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_constant (
         name,
         version,
         type,
-        value,
-        ACE_TRY_ENV
+        value
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7211,8 +7052,8 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_struct (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7227,8 +7068,8 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_struct (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_struct",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7240,8 +7081,8 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_struct (
         id,
         name,
         version,
-        members,
-        ACE_TRY_ENV
+        members
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7251,8 +7092,8 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_union (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7267,8 +7108,8 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_union (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_union",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7281,8 +7122,8 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_union (
         name,
         version,
         discriminator_type,
-        members,
-        ACE_TRY_ENV
+        members
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7291,8 +7132,8 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_enum (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7307,8 +7148,8 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_enum (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_enum",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7320,8 +7161,8 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_enum (
         id,
         name,
         version,
-        members,
-        ACE_TRY_ENV
+        members
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7330,8 +7171,8 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_alias (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7346,8 +7187,8 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_alias (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_alias",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7359,8 +7200,8 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_alias (
         id,
         name,
         version,
-        original_type,
-        ACE_TRY_ENV
+        original_type
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7369,8 +7210,8 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_interface
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7385,8 +7226,8 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_interface
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_interface",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7398,8 +7239,8 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_interface
         id,
         name,
         version,
-        base_interfaces,
-        ACE_TRY_ENV
+        base_interfaces
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7414,8 +7255,8 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value (
     CORBA::Boolean is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7430,8 +7271,8 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_value",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7449,8 +7290,8 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value (
         is_truncatable,
         abstract_base_values,
         supported_interfaces,
-        initializers,
-        ACE_TRY_ENV
+        initializers
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7459,8 +7300,8 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value_box
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7475,8 +7316,8 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value_box
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_value_box",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7488,8 +7329,8 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value_box
         id,
         name,
         version,
-        original_type_def,
-        ACE_TRY_ENV
+        original_type_def
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7498,8 +7339,8 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_exception
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7514,8 +7355,8 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_exception
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_exception",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7527,8 +7368,8 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_exception
         id,
         name,
         version,
-        members,
-        ACE_TRY_ENV
+        members
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7536,8 +7377,8 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_native (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7552,8 +7393,8 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_native (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_native",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7564,8 +7405,8 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_native (
     )->create_native (
         id,
         name,
-        version,
-        ACE_TRY_ENV
+        version
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7574,8 +7415,8 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_a
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7590,8 +7431,8 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_a
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_abstract_interface",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7603,8 +7444,8 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_a
         id,
         name,
         version,
-        base_interfaces,
-        ACE_TRY_ENV
+        base_interfaces
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7613,8 +7454,8 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_loca
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7629,8 +7470,8 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_loca
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_local_interface",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7642,8 +7483,8 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_loca
         id,
         name,
         version,
-        base_interfaces,
-        ACE_TRY_ENV
+        base_interfaces
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7671,8 +7512,8 @@ POA_CORBA_Container::~POA_CORBA_Container (void)
 void POA_CORBA_Container::lookup_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7700,20 +7541,20 @@ void POA_CORBA_Container::lookup_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      search_name.in (),
-      ACE_TRY_ENV
+      search_name.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->lookup (
-          search_name.in (),
-          ACE_TRY_ENV
+          search_name.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7722,20 +7563,20 @@ void POA_CORBA_Container::lookup_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7757,16 +7598,13 @@ void POA_CORBA_Container::lookup_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::contents_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7797,21 +7635,21 @@ void POA_CORBA_Container::contents_skel (
       _tao_upcall,
       _tao_impl,
       limit_type,
-      exclude_inherited,
-      ACE_TRY_ENV
+      exclude_inherited
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->contents (
           limit_type,
-          exclude_inherited,
-          ACE_TRY_ENV
+          exclude_inherited
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7820,20 +7658,20 @@ void POA_CORBA_Container::contents_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7855,16 +7693,13 @@ void POA_CORBA_Container::contents_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::lookup_name_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7901,13 +7736,13 @@ void POA_CORBA_Container::lookup_name_skel (
       search_name.in (),
       levels_to_search,
       limit_type,
-      exclude_inherited,
-      ACE_TRY_ENV
+      exclude_inherited
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -7916,8 +7751,8 @@ void POA_CORBA_Container::lookup_name_skel (
           search_name.in (),
           levels_to_search,
           limit_type,
-          exclude_inherited,
-          ACE_TRY_ENV
+          exclude_inherited
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7926,20 +7761,20 @@ void POA_CORBA_Container::lookup_name_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7961,16 +7796,13 @@ void POA_CORBA_Container::lookup_name_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::describe_contents_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8004,13 +7836,13 @@ void POA_CORBA_Container::describe_contents_skel (
       _tao_impl,
       limit_type,
       exclude_inherited,
-      max_returned_objs,
-      ACE_TRY_ENV
+      max_returned_objs
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8018,8 +7850,8 @@ void POA_CORBA_Container::describe_contents_skel (
       _tao_impl->describe_contents (
           limit_type,
           exclude_inherited,
-          max_returned_objs,
-          ACE_TRY_ENV
+          max_returned_objs
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8028,20 +7860,20 @@ void POA_CORBA_Container::describe_contents_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8063,16 +7895,13 @@ void POA_CORBA_Container::describe_contents_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::create_module_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8106,13 +7935,13 @@ void POA_CORBA_Container::create_module_skel (
       _tao_impl,
       id.in (),
       name.in (),
-      version.in (),
-      ACE_TRY_ENV
+      version.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8120,8 +7949,8 @@ void POA_CORBA_Container::create_module_skel (
       _tao_impl->create_module (
           id.in (),
           name.in (),
-          version.in (),
-          ACE_TRY_ENV
+          version.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8130,20 +7959,20 @@ void POA_CORBA_Container::create_module_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8165,16 +7994,13 @@ void POA_CORBA_Container::create_module_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::create_constant_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8214,13 +8040,13 @@ void POA_CORBA_Container::create_constant_skel (
       name.in (),
       version.in (),
       type.in (),
-      value,
-      ACE_TRY_ENV
+      value
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8230,8 +8056,8 @@ void POA_CORBA_Container::create_constant_skel (
           name.in (),
           version.in (),
           type.in (),
-          value,
-          ACE_TRY_ENV
+          value
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8240,20 +8066,20 @@ void POA_CORBA_Container::create_constant_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8275,16 +8101,13 @@ void POA_CORBA_Container::create_constant_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::create_struct_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8321,13 +8144,13 @@ void POA_CORBA_Container::create_struct_skel (
       id.in (),
       name.in (),
       version.in (),
-      members,
-      ACE_TRY_ENV
+      members
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8336,8 +8159,8 @@ void POA_CORBA_Container::create_struct_skel (
           id.in (),
           name.in (),
           version.in (),
-          members,
-          ACE_TRY_ENV
+          members
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8346,20 +8169,20 @@ void POA_CORBA_Container::create_struct_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8381,16 +8204,13 @@ void POA_CORBA_Container::create_struct_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::create_union_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8430,13 +8250,13 @@ void POA_CORBA_Container::create_union_skel (
       name.in (),
       version.in (),
       discriminator_type.in (),
-      members,
-      ACE_TRY_ENV
+      members
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8446,8 +8266,8 @@ void POA_CORBA_Container::create_union_skel (
           name.in (),
           version.in (),
           discriminator_type.in (),
-          members,
-          ACE_TRY_ENV
+          members
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8456,20 +8276,20 @@ void POA_CORBA_Container::create_union_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8491,16 +8311,13 @@ void POA_CORBA_Container::create_union_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::create_enum_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8537,13 +8354,13 @@ void POA_CORBA_Container::create_enum_skel (
       id.in (),
       name.in (),
       version.in (),
-      members,
-      ACE_TRY_ENV
+      members
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8552,8 +8369,8 @@ void POA_CORBA_Container::create_enum_skel (
           id.in (),
           name.in (),
           version.in (),
-          members,
-          ACE_TRY_ENV
+          members
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8562,20 +8379,20 @@ void POA_CORBA_Container::create_enum_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8597,16 +8414,13 @@ void POA_CORBA_Container::create_enum_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::create_alias_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8643,13 +8457,13 @@ void POA_CORBA_Container::create_alias_skel (
       id.in (),
       name.in (),
       version.in (),
-      original_type.in (),
-      ACE_TRY_ENV
+      original_type.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8658,8 +8472,8 @@ void POA_CORBA_Container::create_alias_skel (
           id.in (),
           name.in (),
           version.in (),
-          original_type.in (),
-          ACE_TRY_ENV
+          original_type.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8668,20 +8482,20 @@ void POA_CORBA_Container::create_alias_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8703,16 +8517,13 @@ void POA_CORBA_Container::create_alias_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::create_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8749,13 +8560,13 @@ void POA_CORBA_Container::create_interface_skel (
       id.in (),
       name.in (),
       version.in (),
-      base_interfaces,
-      ACE_TRY_ENV
+      base_interfaces
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8764,8 +8575,8 @@ void POA_CORBA_Container::create_interface_skel (
           id.in (),
           name.in (),
           version.in (),
-          base_interfaces,
-          ACE_TRY_ENV
+          base_interfaces
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8774,20 +8585,20 @@ void POA_CORBA_Container::create_interface_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8809,16 +8620,13 @@ void POA_CORBA_Container::create_interface_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::create_value_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8873,13 +8681,13 @@ void POA_CORBA_Container::create_value_skel (
       is_truncatable,
       abstract_base_values,
       supported_interfaces,
-      initializers,
-      ACE_TRY_ENV
+      initializers
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8894,8 +8702,8 @@ void POA_CORBA_Container::create_value_skel (
           is_truncatable,
           abstract_base_values,
           supported_interfaces,
-          initializers,
-          ACE_TRY_ENV
+          initializers
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8904,20 +8712,20 @@ void POA_CORBA_Container::create_value_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8939,16 +8747,13 @@ void POA_CORBA_Container::create_value_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::create_value_box_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8985,13 +8790,13 @@ void POA_CORBA_Container::create_value_box_skel (
       id.in (),
       name.in (),
       version.in (),
-      original_type_def.in (),
-      ACE_TRY_ENV
+      original_type_def.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -9000,8 +8805,8 @@ void POA_CORBA_Container::create_value_box_skel (
           id.in (),
           name.in (),
           version.in (),
-          original_type_def.in (),
-          ACE_TRY_ENV
+          original_type_def.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -9010,20 +8815,20 @@ void POA_CORBA_Container::create_value_box_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9045,16 +8850,13 @@ void POA_CORBA_Container::create_value_box_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::create_exception_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9091,13 +8893,13 @@ void POA_CORBA_Container::create_exception_skel (
       id.in (),
       name.in (),
       version.in (),
-      members,
-      ACE_TRY_ENV
+      members
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -9106,8 +8908,8 @@ void POA_CORBA_Container::create_exception_skel (
           id.in (),
           name.in (),
           version.in (),
-          members,
-          ACE_TRY_ENV
+          members
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -9116,20 +8918,20 @@ void POA_CORBA_Container::create_exception_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9151,16 +8953,13 @@ void POA_CORBA_Container::create_exception_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::create_native_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9194,13 +8993,13 @@ void POA_CORBA_Container::create_native_skel (
       _tao_impl,
       id.in (),
       name.in (),
-      version.in (),
-      ACE_TRY_ENV
+      version.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -9208,8 +9007,8 @@ void POA_CORBA_Container::create_native_skel (
       _tao_impl->create_native (
           id.in (),
           name.in (),
-          version.in (),
-          ACE_TRY_ENV
+          version.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -9218,20 +9017,20 @@ void POA_CORBA_Container::create_native_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9253,16 +9052,13 @@ void POA_CORBA_Container::create_native_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::create_abstract_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9299,13 +9095,13 @@ void POA_CORBA_Container::create_abstract_interface_skel (
       id.in (),
       name.in (),
       version.in (),
-      base_interfaces,
-      ACE_TRY_ENV
+      base_interfaces
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -9314,8 +9110,8 @@ void POA_CORBA_Container::create_abstract_interface_skel (
           id.in (),
           name.in (),
           version.in (),
-          base_interfaces,
-          ACE_TRY_ENV
+          base_interfaces
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -9324,20 +9120,20 @@ void POA_CORBA_Container::create_abstract_interface_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9359,16 +9155,13 @@ void POA_CORBA_Container::create_abstract_interface_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::create_local_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9405,13 +9198,13 @@ void POA_CORBA_Container::create_local_interface_skel (
       id.in (),
       name.in (),
       version.in (),
-      base_interfaces,
-      ACE_TRY_ENV
+      base_interfaces
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -9420,8 +9213,8 @@ void POA_CORBA_Container::create_local_interface_skel (
           id.in (),
           name.in (),
           version.in (),
-          base_interfaces,
-          ACE_TRY_ENV
+          base_interfaces
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -9430,20 +9223,20 @@ void POA_CORBA_Container::create_local_interface_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9465,16 +9258,13 @@ void POA_CORBA_Container::create_local_interface_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9484,7 +9274,7 @@ void POA_CORBA_Container::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9496,12 +9286,12 @@ void POA_CORBA_Container::_is_a_skel (
 void POA_CORBA_Container::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9513,8 +9303,8 @@ void POA_CORBA_Container::_non_existent_skel (
 void POA_CORBA_Container::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *) _tao_object_reference;
@@ -9533,7 +9323,7 @@ void POA_CORBA_Container::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -9559,11 +9349,11 @@ void POA_CORBA_Container::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_Container::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -9588,12 +9378,12 @@ void* POA_CORBA_Container::_downcast (
   return 0;
 }
 
-void POA_CORBA_Container::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_Container::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -9603,9 +9393,9 @@ const char* POA_CORBA_Container::_interface_repository_id (void) const
 }
 
 CORBA_Container*
-POA_CORBA_Container::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_Container::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -9740,36 +9530,32 @@ public:
   TAO_ServerRequestInfo_CORBA_IDLType_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_IDLType *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -9786,45 +9572,45 @@ private:
 TAO_ServerRequestInfo_CORBA_IDLType_type_get::TAO_ServerRequestInfo_CORBA_IDLType_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_IDLType *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_IDLType *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_IDLType_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_IDLType_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_IDLType_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_IDLType_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_IDLType_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_IDLType_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -9836,7 +9622,7 @@ TAO_ServerRequestInfo_CORBA_IDLType_type_get::result (CORBA::Environment &ACE_TR
 
 char *
 TAO_ServerRequestInfo_CORBA_IDLType_type_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -9845,11 +9631,11 @@ TAO_ServerRequestInfo_CORBA_IDLType_type_get::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_IDLType_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -9888,18 +9674,18 @@ _TAO_CORBA_IDLType_Strategized_Proxy_Broker::~_TAO_CORBA_IDLType_Strategized_Pro
 
 _TAO_CORBA_IDLType_Proxy_Impl&
 _TAO_CORBA_IDLType_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_IDLType *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_IDLType *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -9908,8 +9694,8 @@ _TAO_CORBA_IDLType_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_IDLType_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -9978,8 +9764,8 @@ _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl (vo
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::TypeCode_ptr _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl::type (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -9994,8 +9780,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl::type (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "type",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -10004,7 +9790,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl::type (
           "IDL:omg.org/CORBA/IDLType:1.0"
         )
     )->type (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -10032,8 +9818,8 @@ POA_CORBA_IDLType::~POA_CORBA_IDLType (void)
 void POA_CORBA_IDLType::_get_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType *_tao_impl =
@@ -10053,19 +9839,19 @@ void POA_CORBA_IDLType::_get_type_skel (
   TAO_ServerRequestInfo_CORBA_IDLType_type_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->type (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -10074,20 +9860,20 @@ void POA_CORBA_IDLType::_get_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -10109,16 +9895,13 @@ void POA_CORBA_IDLType::_get_type_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_IDLType::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -10128,7 +9911,7 @@ void POA_CORBA_IDLType::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10140,12 +9923,12 @@ void POA_CORBA_IDLType::_is_a_skel (
 void POA_CORBA_IDLType::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType *_tao_impl = (POA_CORBA_IDLType *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10157,8 +9940,8 @@ void POA_CORBA_IDLType::_non_existent_skel (
 void POA_CORBA_IDLType::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType *_tao_impl = (POA_CORBA_IDLType *) _tao_object_reference;
@@ -10177,7 +9960,7 @@ void POA_CORBA_IDLType::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -10203,11 +9986,11 @@ void POA_CORBA_IDLType::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_IDLType::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -10232,12 +10015,12 @@ void* POA_CORBA_IDLType::_downcast (
   return 0;
 }
 
-void POA_CORBA_IDLType::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_IDLType::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -10247,9 +10030,9 @@ const char* POA_CORBA_IDLType::_interface_repository_id (void) const
 }
 
 CORBA_IDLType*
-POA_CORBA_IDLType::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_IDLType::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -10437,18 +10220,18 @@ _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::~_TAO_CORBA_TypedefDef_Strategiz
 
 _TAO_CORBA_TypedefDef_Proxy_Impl&
 _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_TypedefDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_TypedefDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -10457,8 +10240,8 @@ _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -10552,8 +10335,8 @@ POA_CORBA_TypedefDef::~POA_CORBA_TypedefDef (void)
 void POA_CORBA_TypedefDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -10563,7 +10346,7 @@ void POA_CORBA_TypedefDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10575,12 +10358,12 @@ void POA_CORBA_TypedefDef::_is_a_skel (
 void POA_CORBA_TypedefDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_TypedefDef *_tao_impl = (POA_CORBA_TypedefDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10592,8 +10375,8 @@ void POA_CORBA_TypedefDef::_non_existent_skel (
 void POA_CORBA_TypedefDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_TypedefDef *_tao_impl = (POA_CORBA_TypedefDef *) _tao_object_reference;
@@ -10612,7 +10395,7 @@ void POA_CORBA_TypedefDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -10638,11 +10421,11 @@ void POA_CORBA_TypedefDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_TypedefDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -10673,12 +10456,12 @@ void* POA_CORBA_TypedefDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_TypedefDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_TypedefDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -10688,9 +10471,9 @@ const char* POA_CORBA_TypedefDef::_interface_repository_id (void) const
 }
 
 CORBA_TypedefDef*
-POA_CORBA_TypedefDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_TypedefDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS.h b/TAO/orbsvcs/IFR_Service/IFR_BaseS.h
index c06ea700b74..245cba71f61 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BaseS.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS.h
@@ -63,10 +63,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -75,65 +74,62 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_IRObject *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_def_kind_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void destroy_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
 
@@ -141,19 +137,19 @@ public:
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_IRObject_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_IRObject_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_IRObject_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_IRObject_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_IRObject_Proxy_Impl &select_proxy (
-    ::CORBA_IRObject *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_IRObject *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -161,18 +157,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_IRObject_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -184,7 +180,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -192,32 +188,32 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_IRObject_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl
 {
 public:
   _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_IRObject_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::DefinitionKind def_kind (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void destroy (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -242,10 +238,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -254,242 +249,228 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_Contained *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_id_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_id_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_name_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_name_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_version_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_version_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_defined_in_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_absolute_name_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_containing_repository_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void describe_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void move_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_Contained_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_Contained_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_Contained_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_Contained_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_Contained_Proxy_Impl &select_proxy (
-    ::CORBA_Contained *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_Contained *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -497,18 +478,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_Contained_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -520,7 +501,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -528,112 +509,112 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_Contained_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_Contained_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_Contained_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_IRObject_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_Contained_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_Contained_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual char * id (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void id (
       CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV
+      const char * id
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual char * name (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void name (
       CORBA_Object *_collocated_tao_target_,
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV
+      const char * name
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual char * version (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void version (
       CORBA_Object *_collocated_tao_target_,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV
+      const char * version
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_Container_ptr defined_in (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual char * absolute_name (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_Repository_ptr containing_repository (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_Contained::Description * describe (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void move (
       CORBA_Object *_collocated_tao_target_,
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV
+      const char * new_version
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -658,10 +639,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -670,123 +650,117 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_Container *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * search_name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void lookup_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void contents_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void lookup_name_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Long max_returned_objs
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void describe_contents_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_module_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ConstantDef_ptr create_constant (
@@ -794,38 +768,36 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_constant_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_struct_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_UnionDef_ptr create_union (
@@ -833,76 +805,72 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_union_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_enum_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_alias_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_interface_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ValueDef_ptr create_value (
@@ -915,149 +883,141 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_value_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_value_box_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_exception_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_native_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_abstract_interface_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_local_interface_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_Container_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_Container_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_Container_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_Container_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_Container_Proxy_Impl &select_proxy (
-    ::CORBA_Container *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_Container *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -1065,18 +1025,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_Container_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -1088,7 +1048,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -1096,144 +1056,144 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_Container_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_Container_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_Container_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_IRObject_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_Container_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_Container_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA_Contained_ptr lookup (
       CORBA_Object *_collocated_tao_target_,
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV
+      const char * search_name
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ContainedSeq * contents (
       CORBA_Object *_collocated_tao_target_,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ContainedSeq * lookup_name (
       CORBA_Object *_collocated_tao_target_,
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_Container::DescriptionSeq * describe_contents (
       CORBA_Object *_collocated_tao_target_,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Long max_returned_objs
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ModuleDef_ptr create_module (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV
+      const char * version
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ConstantDef_ptr create_constant (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_StructDef_ptr create_struct (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_UnionDef_ptr create_union (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_EnumDef_ptr create_enum (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_AliasDef_ptr create_alias (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_IDLType_ptr original_type
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_InterfaceDef_ptr create_interface (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ValueDef_ptr create_value (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
@@ -1245,73 +1205,73 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ValueBoxDef_ptr create_value_box (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ExceptionDef_ptr create_exception (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_NativeDef_ptr create_native (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV
+      const char * version
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_LocalInterfaceDef_ptr create_local_interface (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -1336,10 +1296,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -1348,86 +1307,82 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_IDLType *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_type_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_IDLType_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_IDLType_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_IDLType_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_IDLType_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_IDLType_Proxy_Impl &select_proxy (
-    ::CORBA_IDLType *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_IDLType *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -1435,18 +1390,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_IDLType_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -1458,7 +1413,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -1466,26 +1421,26 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_IDLType_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_IRObject_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::TypeCode_ptr type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -1510,10 +1465,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -1522,167 +1476,152 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_TypedefDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_TypedefDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_TypedefDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_TypedefDef_Proxy_Impl &select_proxy (
-    ::CORBA_TypedefDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_TypedefDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -1690,18 +1629,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_TypedefDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -1713,7 +1652,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -1721,18 +1660,18 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_TypedefDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl, 
+  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl,
   public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl (void) { }
-  
+
 };
 
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS.i b/TAO/orbsvcs/IFR_Service/IFR_BaseS.i
index 31bdd6252fd..477a44b0871 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BaseS.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS.i
@@ -22,300 +22,300 @@
 ACE_INLINE void POA_CORBA_Contained::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_Contained_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Contained::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_Contained_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Container::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_Container_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Container::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_Container_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_IDLType::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_IDLType_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_IDLType::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_IDLType_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h
index fb327f82865..87fb981b893 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h
@@ -52,7 +52,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_IRObject_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -64,33 +64,30 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_IRObject_tie (const POA_CORBA_IRObject_tie &);
   void operator= (const POA_CORBA_IRObject_tie &);
@@ -111,7 +108,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_Contained_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -123,127 +120,113 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_Contained_tie (const POA_CORBA_Contained_tie &);
   void operator= (const POA_CORBA_Contained_tie &);
@@ -264,7 +247,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_Container_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -276,139 +259,127 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * search_name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Long max_returned_objs
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueDef_ptr create_value (
       const char * id,
       const char * name,
@@ -419,94 +390,86 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_Container_tie (const POA_CORBA_Container_tie &);
   void operator= (const POA_CORBA_Container_tie &);
@@ -527,7 +490,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_IDLType_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -539,41 +502,37 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_IDLType_tie (const POA_CORBA_IDLType_tie &);
   void operator= (const POA_CORBA_IDLType_tie &);
@@ -594,7 +553,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_TypedefDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -606,135 +565,120 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_TypedefDef_tie (const POA_CORBA_TypedefDef_tie &);
   void operator= (const POA_CORBA_TypedefDef_tie &);
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i
index c2619822298..ee67530cc11 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i
@@ -23,30 +23,30 @@
 
 template <class T> ACE_INLINE
 POA_CORBA_IRObject_tie<T>::POA_CORBA_IRObject_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_IRObject_tie<T>::POA_CORBA_IRObject_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_IRObject_tie<T>::POA_CORBA_IRObject_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_IRObject_tie<T>::POA_CORBA_IRObject_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -90,66 +90,66 @@ POA_CORBA_IRObject_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_IRObject_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_IRObject_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_IRObject::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_IRObject::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_IRObject_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_IRObject_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_Contained_tie<T>::POA_CORBA_Contained_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_Contained_tie<T>::POA_CORBA_Contained_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_Contained_tie<T>::POA_CORBA_Contained_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_Contained_tie<T>::POA_CORBA_Contained_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -193,147 +193,147 @@ POA_CORBA_Contained_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_Contained_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_Contained_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_Contained::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_Contained::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_Contained_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_Contained_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_Contained_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_Contained_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_Contained_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_Contained_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_Contained_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_Contained_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_Contained_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_Contained_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -341,8 +341,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_Contained_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -351,63 +351,63 @@ void POA_CORBA_Contained_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_Contained_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_Contained_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_Container_tie<T>::POA_CORBA_Container_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_Container_tie<T>::POA_CORBA_Container_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_Container_tie<T>::POA_CORBA_Container_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_Container_tie<T>::POA_CORBA_Container_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -451,34 +451,34 @@ POA_CORBA_Container_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_Container_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_Container_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_Container::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_Container::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_Container_tie<T>::lookup  (
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup (
-search_name,
-    ACE_TRY_ENV
+search_name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_Container_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -486,8 +486,8 @@ CORBA_ContainedSeq * POA_CORBA_Container_tie<T>::contents  (
 {
   return this->ptr_->contents (
 limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -496,8 +496,8 @@ CORBA_ContainedSeq * POA_CORBA_Container_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -507,8 +507,8 @@ CORBA_ContainedSeq * POA_CORBA_Container_tie<T>::lookup_name  (
 search_name,
     levels_to_search,
     limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -516,8 +516,8 @@ template <class T> ACE_INLINE
 CORBA_Container::DescriptionSeq * POA_CORBA_Container_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Long max_returned_objs
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -526,8 +526,8 @@ CORBA_Container::DescriptionSeq * POA_CORBA_Container_tie<T>::describe_contents
   return this->ptr_->describe_contents (
 limit_type,
     exclude_inherited,
-    max_returned_objs,
-    ACE_TRY_ENV
+    max_returned_objs
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -535,8 +535,8 @@ template <class T> ACE_INLINE
 CORBA_ModuleDef_ptr POA_CORBA_Container_tie<T>::create_module  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -545,8 +545,8 @@ CORBA_ModuleDef_ptr POA_CORBA_Container_tie<T>::create_module  (
   return this->ptr_->create_module (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -556,8 +556,8 @@ CORBA_ConstantDef_ptr POA_CORBA_Container_tie<T>::create_constant  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -568,8 +568,8 @@ id,
     name,
     version,
     type,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -578,8 +578,8 @@ CORBA_StructDef_ptr POA_CORBA_Container_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -589,8 +589,8 @@ CORBA_StructDef_ptr POA_CORBA_Container_tie<T>::create_struct  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -600,8 +600,8 @@ CORBA_UnionDef_ptr POA_CORBA_Container_tie<T>::create_union  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -612,8 +612,8 @@ id,
     name,
     version,
     discriminator_type,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -622,8 +622,8 @@ CORBA_EnumDef_ptr POA_CORBA_Container_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -633,8 +633,8 @@ CORBA_EnumDef_ptr POA_CORBA_Container_tie<T>::create_enum  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -643,8 +643,8 @@ CORBA_AliasDef_ptr POA_CORBA_Container_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -654,8 +654,8 @@ CORBA_AliasDef_ptr POA_CORBA_Container_tie<T>::create_alias  (
 id,
     name,
     version,
-    original_type,
-    ACE_TRY_ENV
+    original_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -664,8 +664,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_Container_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -675,8 +675,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_Container_tie<T>::create_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -691,8 +691,8 @@ CORBA_ValueDef_ptr POA_CORBA_Container_tie<T>::create_value  (
     CORBA::Boolean is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -708,8 +708,8 @@ id,
     is_truncatable,
     abstract_base_values,
     supported_interfaces,
-    initializers,
-    ACE_TRY_ENV
+    initializers
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -718,8 +718,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_Container_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -729,8 +729,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_Container_tie<T>::create_value_box  (
 id,
     name,
     version,
-    original_type_def,
-    ACE_TRY_ENV
+    original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -739,8 +739,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_Container_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -750,8 +750,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_Container_tie<T>::create_exception  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -759,8 +759,8 @@ template <class T> ACE_INLINE
 CORBA_NativeDef_ptr POA_CORBA_Container_tie<T>::create_native  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -769,8 +769,8 @@ CORBA_NativeDef_ptr POA_CORBA_Container_tie<T>::create_native  (
   return this->ptr_->create_native (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -779,8 +779,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_Container_tie<T>::create_abstract_inter
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -790,8 +790,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_Container_tie<T>::create_abstract_inter
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -800,8 +800,8 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_Container_tie<T>::create_local_interface
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -811,63 +811,63 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_Container_tie<T>::create_local_interface
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_Container_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_Container_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_IDLType_tie<T>::POA_CORBA_IDLType_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_IDLType_tie<T>::POA_CORBA_IDLType_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_IDLType_tie<T>::POA_CORBA_IDLType_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_IDLType_tie<T>::POA_CORBA_IDLType_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -911,79 +911,79 @@ POA_CORBA_IDLType_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_IDLType_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_IDLType_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_IDLType::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_IDLType::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_IDLType_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_IDLType_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_IDLType_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_TypedefDef_tie<T>::POA_CORBA_TypedefDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_TypedefDef_tie<T>::POA_CORBA_TypedefDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_TypedefDef_tie<T>::POA_CORBA_TypedefDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_TypedefDef_tie<T>::POA_CORBA_TypedefDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -1027,147 +1027,147 @@ POA_CORBA_TypedefDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_TypedefDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_TypedefDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_TypedefDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_TypedefDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_TypedefDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_TypedefDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_TypedefDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_TypedefDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_TypedefDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_TypedefDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_TypedefDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_TypedefDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_TypedefDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_TypedefDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1175,8 +1175,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_TypedefDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1185,47 +1185,47 @@ void POA_CORBA_TypedefDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_TypedefDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_TypedefDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_TypedefDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp b/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp
index c8f2423cca2..40d924df88c 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp
@@ -209,36 +209,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl
     ,
-    const char * search_id,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * search_id
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_Contained_ptr result);
@@ -257,8 +253,8 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::TAO_ServerRequestInfo_CORBA_Re
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Repository *tao_impl,
-    const char * search_id,
-    CORBA::Environment &
+    const char * search_id
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -266,12 +262,12 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::TAO_ServerRequestInfo_CORBA_Re
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Repository_lookup_id::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_lookup_id::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -287,25 +283,25 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Repository_lookup_id::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_lookup_id::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Repository_lookup_id::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_lookup_id::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -317,7 +313,7 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::result (CORBA::Environment &AC
 
 char *
 TAO_ServerRequestInfo_CORBA_Repository_lookup_id::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -326,11 +322,11 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Repository_lookup_id::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -347,36 +343,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl
     ,
-    CORBA::TypeCode_ptr tc,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA::TypeCode_ptr tc
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -395,8 +387,8 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::TAO_ServerRequest
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Repository *tao_impl,
-    CORBA::TypeCode_ptr tc,
-    CORBA::Environment &
+    CORBA::TypeCode_ptr tc
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -404,12 +396,12 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::TAO_ServerRequest
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -425,25 +417,25 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::arguments (CORBA:
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -455,7 +447,7 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::result (CORBA::En
 
 char *
 TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -464,11 +456,11 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::target_most_deriv
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -485,36 +477,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl
     ,
-    CORBA::PrimitiveKind & kind,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA::PrimitiveKind & kind
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_PrimitiveDef_ptr result);
@@ -533,8 +521,8 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::TAO_ServerRequestInfo_CORB
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Repository *tao_impl,
-    CORBA::PrimitiveKind & kind,
-    CORBA::Environment &
+    CORBA::PrimitiveKind & kind
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -542,12 +530,12 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::TAO_ServerRequestInfo_CORB
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Repository_get_primitive::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_get_primitive::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -563,25 +551,25 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::arguments (CORBA::Environm
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Repository_get_primitive::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_get_primitive::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Repository_get_primitive::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_get_primitive::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -593,7 +581,7 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_Repository_get_primitive::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -602,11 +590,11 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::target_most_derived_interf
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Repository_get_primitive::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -623,36 +611,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl
     ,
-    const CORBA::ULong & bound,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::ULong & bound
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_StringDef_ptr result);
@@ -671,8 +655,8 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::TAO_ServerRequestInfo_CORB
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Repository *tao_impl,
-    const CORBA::ULong & bound,
-    CORBA::Environment &
+    const CORBA::ULong & bound
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -680,12 +664,12 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::TAO_ServerRequestInfo_CORB
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Repository_create_string::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_string::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -701,25 +685,25 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::arguments (CORBA::Environm
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Repository_create_string::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_string::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Repository_create_string::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_string::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -731,7 +715,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_Repository_create_string::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -740,11 +724,11 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::target_most_derived_interf
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Repository_create_string::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -761,36 +745,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl
     ,
-    const CORBA::ULong & bound,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::ULong & bound
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_WstringDef_ptr result);
@@ -809,8 +789,8 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::TAO_ServerRequestInfo_COR
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Repository *tao_impl,
-    const CORBA::ULong & bound,
-    CORBA::Environment &
+    const CORBA::ULong & bound
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -818,12 +798,12 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::TAO_ServerRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Repository_create_wstring::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_wstring::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -839,25 +819,25 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Repository_create_wstring::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_wstring::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Repository_create_wstring::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_wstring::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -869,7 +849,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_CORBA_Repository_create_wstring::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -878,11 +858,11 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Repository_create_wstring::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -900,36 +880,32 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl
     ,
     const CORBA::ULong & bound,
-    CORBA_IDLType_ptr element_type,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_IDLType_ptr element_type
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_SequenceDef_ptr result);
@@ -950,8 +926,8 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::TAO_ServerRequestInfo_CO
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Repository *tao_impl,
     const CORBA::ULong & bound,
-    CORBA_IDLType_ptr element_type,
-    CORBA::Environment &
+    CORBA_IDLType_ptr element_type
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -960,12 +936,12 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::TAO_ServerRequestInfo_CO
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Repository_create_sequence::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_sequence::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -984,25 +960,25 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::arguments (CORBA::Enviro
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Repository_create_sequence::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_sequence::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Repository_create_sequence::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_sequence::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1014,7 +990,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::result (CORBA::Environme
 
 char *
 TAO_ServerRequestInfo_CORBA_Repository_create_sequence::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1023,11 +999,11 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::target_most_derived_inte
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Repository_create_sequence::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1045,36 +1021,32 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl
     ,
     const CORBA::ULong & length,
-    CORBA_IDLType_ptr element_type,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_IDLType_ptr element_type
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ArrayDef_ptr result);
@@ -1095,8 +1067,8 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::TAO_ServerRequestInfo_CORBA
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Repository *tao_impl,
     const CORBA::ULong & length,
-    CORBA_IDLType_ptr element_type,
-    CORBA::Environment &
+    CORBA_IDLType_ptr element_type
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1105,12 +1077,12 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::TAO_ServerRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Repository_create_array::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_array::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1129,25 +1101,25 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::arguments (CORBA::Environme
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Repository_create_array::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_array::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Repository_create_array::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_array::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1159,7 +1131,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_Repository_create_array::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1168,11 +1140,11 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::target_most_derived_interfa
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Repository_create_array::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1190,36 +1162,32 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl
     ,
     const CORBA::UShort & digits,
-    const CORBA::Short & scale,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::Short & scale
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_FixedDef_ptr result);
@@ -1240,8 +1208,8 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::TAO_ServerRequestInfo_CORBA
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Repository *tao_impl,
     const CORBA::UShort & digits,
-    const CORBA::Short & scale,
-    CORBA::Environment &
+    const CORBA::Short & scale
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1250,12 +1218,12 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::TAO_ServerRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Repository_create_fixed::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_fixed::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1274,25 +1242,25 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::arguments (CORBA::Environme
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Repository_create_fixed::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_fixed::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Repository_create_fixed::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_fixed::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1304,7 +1272,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_Repository_create_fixed::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1313,11 +1281,11 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::target_most_derived_interfa
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Repository_create_fixed::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1356,18 +1324,18 @@ _TAO_CORBA_Repository_Strategized_Proxy_Broker::~_TAO_CORBA_Repository_Strategiz
 
 _TAO_CORBA_Repository_Proxy_Impl&
 _TAO_CORBA_Repository_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_Repository *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_Repository *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -1376,8 +1344,8 @@ _TAO_CORBA_Repository_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_Repository_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -1447,8 +1415,8 @@ _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::_TAO_CORBA_Repository_ThruPOA_Proxy_Im
 
 CORBA_Contained_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::lookup_id (
     CORBA_Object *_collocated_tao_target_,
-    const char * search_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1463,8 +1431,8 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::lookup_id (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "lookup_id",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -1473,15 +1441,15 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::lookup_id (
           "IDL:omg.org/CORBA/Repository:1.0"
         )
     )->lookup_id (
-        search_id,
-        ACE_TRY_ENV
+        search_id
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
 CORBA::TypeCode_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_canonical_typecode (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::TypeCode_ptr tc,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::TypeCode_ptr tc
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1496,8 +1464,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_canonical_type
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "get_canonical_typecode",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -1506,15 +1474,15 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_canonical_type
           "IDL:omg.org/CORBA/Repository:1.0"
         )
     )->get_canonical_typecode (
-        tc,
-        ACE_TRY_ENV
+        tc
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_primitive (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::PrimitiveKind kind,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::PrimitiveKind kind
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1529,8 +1497,8 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_primitive (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "get_primitive",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -1539,15 +1507,15 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_primitive (
           "IDL:omg.org/CORBA/Repository:1.0"
         )
     )->get_primitive (
-        kind,
-        ACE_TRY_ENV
+        kind
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_StringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_string (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1562,8 +1530,8 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_string (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_string",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -1572,15 +1540,15 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_string (
           "IDL:omg.org/CORBA/Repository:1.0"
         )
     )->create_string (
-        bound,
-        ACE_TRY_ENV
+        bound
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_WstringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_wstring (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1595,8 +1563,8 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_wstring (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_wstring",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -1605,16 +1573,16 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_wstring (
           "IDL:omg.org/CORBA/Repository:1.0"
         )
     )->create_wstring (
-        bound,
-        ACE_TRY_ENV
+        bound
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_SequenceDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_sequence (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound,
-    CORBA_IDLType_ptr element_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr element_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1629,8 +1597,8 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_sequence
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_sequence",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -1640,16 +1608,16 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_sequence
         )
     )->create_sequence (
         bound,
-        element_type,
-        ACE_TRY_ENV
+        element_type
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_ArrayDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_array (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong length,
-    CORBA_IDLType_ptr element_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr element_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1664,8 +1632,8 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_array (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_array",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -1675,16 +1643,16 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_array (
         )
     )->create_array (
         length,
-        element_type,
-        ACE_TRY_ENV
+        element_type
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_FixedDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_fixed (
     CORBA_Object *_collocated_tao_target_,
     CORBA::UShort digits,
-    CORBA::Short scale,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Short scale
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1699,8 +1667,8 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_fixed (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_fixed",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -1710,8 +1678,8 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_fixed (
         )
     )->create_fixed (
         digits,
-        scale,
-        ACE_TRY_ENV
+        scale
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -1740,8 +1708,8 @@ POA_CORBA_Repository::~POA_CORBA_Repository (void)
 void POA_CORBA_Repository::lookup_id_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -1769,20 +1737,20 @@ void POA_CORBA_Repository::lookup_id_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      search_id.in (),
-      ACE_TRY_ENV
+      search_id.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->lookup_id (
-          search_id.in (),
-          ACE_TRY_ENV
+          search_id.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -1791,20 +1759,20 @@ void POA_CORBA_Repository::lookup_id_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1826,16 +1794,13 @@ void POA_CORBA_Repository::lookup_id_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Repository::get_canonical_typecode_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -1863,20 +1828,20 @@ void POA_CORBA_Repository::get_canonical_typecode_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      tc.in (),
-      ACE_TRY_ENV
+      tc.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->get_canonical_typecode (
-          tc.in (),
-          ACE_TRY_ENV
+          tc.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -1885,20 +1850,20 @@ void POA_CORBA_Repository::get_canonical_typecode_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1920,16 +1885,13 @@ void POA_CORBA_Repository::get_canonical_typecode_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Repository::get_primitive_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -1957,20 +1919,20 @@ void POA_CORBA_Repository::get_primitive_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      kind,
-      ACE_TRY_ENV
+      kind
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->get_primitive (
-          kind,
-          ACE_TRY_ENV
+          kind
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -1979,20 +1941,20 @@ void POA_CORBA_Repository::get_primitive_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2014,16 +1976,13 @@ void POA_CORBA_Repository::get_primitive_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Repository::create_string_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2051,20 +2010,20 @@ void POA_CORBA_Repository::create_string_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      bound,
-      ACE_TRY_ENV
+      bound
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->create_string (
-          bound,
-          ACE_TRY_ENV
+          bound
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2073,20 +2032,20 @@ void POA_CORBA_Repository::create_string_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2108,16 +2067,13 @@ void POA_CORBA_Repository::create_string_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Repository::create_wstring_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2145,20 +2101,20 @@ void POA_CORBA_Repository::create_wstring_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      bound,
-      ACE_TRY_ENV
+      bound
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->create_wstring (
-          bound,
-          ACE_TRY_ENV
+          bound
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2167,20 +2123,20 @@ void POA_CORBA_Repository::create_wstring_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2202,16 +2158,13 @@ void POA_CORBA_Repository::create_wstring_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Repository::create_sequence_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2242,21 +2195,21 @@ void POA_CORBA_Repository::create_sequence_skel (
       _tao_upcall,
       _tao_impl,
       bound,
-      element_type.in (),
-      ACE_TRY_ENV
+      element_type.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->create_sequence (
           bound,
-          element_type.in (),
-          ACE_TRY_ENV
+          element_type.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2265,20 +2218,20 @@ void POA_CORBA_Repository::create_sequence_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2300,16 +2253,13 @@ void POA_CORBA_Repository::create_sequence_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Repository::create_array_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2340,21 +2290,21 @@ void POA_CORBA_Repository::create_array_skel (
       _tao_upcall,
       _tao_impl,
       length,
-      element_type.in (),
-      ACE_TRY_ENV
+      element_type.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->create_array (
           length,
-          element_type.in (),
-          ACE_TRY_ENV
+          element_type.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2363,20 +2313,20 @@ void POA_CORBA_Repository::create_array_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2398,16 +2348,13 @@ void POA_CORBA_Repository::create_array_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Repository::create_fixed_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2438,21 +2385,21 @@ void POA_CORBA_Repository::create_fixed_skel (
       _tao_upcall,
       _tao_impl,
       digits,
-      scale,
-      ACE_TRY_ENV
+      scale
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->create_fixed (
           digits,
-          scale,
-          ACE_TRY_ENV
+          scale
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2461,20 +2408,20 @@ void POA_CORBA_Repository::create_fixed_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2496,16 +2443,13 @@ void POA_CORBA_Repository::create_fixed_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Repository::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2515,7 +2459,7 @@ void POA_CORBA_Repository::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -2527,12 +2471,12 @@ void POA_CORBA_Repository::_is_a_skel (
 void POA_CORBA_Repository::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository *_tao_impl = (POA_CORBA_Repository *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -2544,8 +2488,8 @@ void POA_CORBA_Repository::_non_existent_skel (
 void POA_CORBA_Repository::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository *_tao_impl = (POA_CORBA_Repository *) _tao_object_reference;
@@ -2564,7 +2508,7 @@ void POA_CORBA_Repository::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -2590,11 +2534,11 @@ void POA_CORBA_Repository::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_Repository::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -2622,12 +2566,12 @@ void* POA_CORBA_Repository::_downcast (
   return 0;
 }
 
-void POA_CORBA_Repository::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_Repository::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -2637,9 +2581,9 @@ const char* POA_CORBA_Repository::_interface_repository_id (void) const
 }
 
 CORBA_Repository*
-POA_CORBA_Repository::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_Repository::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -2846,18 +2790,18 @@ _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::~_TAO_CORBA_ModuleDef_Strategized
 
 _TAO_CORBA_ModuleDef_Proxy_Impl&
 _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_ModuleDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_ModuleDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -2866,8 +2810,8 @@ _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -2961,8 +2905,8 @@ POA_CORBA_ModuleDef::~POA_CORBA_ModuleDef (void)
 void POA_CORBA_ModuleDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2972,7 +2916,7 @@ void POA_CORBA_ModuleDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -2984,12 +2928,12 @@ void POA_CORBA_ModuleDef::_is_a_skel (
 void POA_CORBA_ModuleDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ModuleDef *_tao_impl = (POA_CORBA_ModuleDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -3001,8 +2945,8 @@ void POA_CORBA_ModuleDef::_non_existent_skel (
 void POA_CORBA_ModuleDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ModuleDef *_tao_impl = (POA_CORBA_ModuleDef *) _tao_object_reference;
@@ -3021,7 +2965,7 @@ void POA_CORBA_ModuleDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -3047,11 +2991,11 @@ void POA_CORBA_ModuleDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_ModuleDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -3082,12 +3026,12 @@ void* POA_CORBA_ModuleDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_ModuleDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_ModuleDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -3097,9 +3041,9 @@ const char* POA_CORBA_ModuleDef::_interface_repository_id (void) const
 }
 
 CORBA_ModuleDef*
-POA_CORBA_ModuleDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_ModuleDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -3269,36 +3213,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ConstantDef_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -3315,45 +3255,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::TAO_ServerRequestInfo_CORBA_ConstantDef_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ConstantDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ConstantDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -3365,7 +3305,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::result (CORBA::Environment &AC
 
 char *
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3374,11 +3314,11 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -3394,36 +3334,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_IDLType_ptr result);
@@ -3440,45 +3376,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ConstantDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ConstantDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -3490,7 +3426,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3499,11 +3435,11 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::target_most_derived_interf
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -3520,36 +3456,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl
     ,
-    CORBA_IDLType_ptr type_def,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_IDLType_ptr type_def
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -3567,8 +3499,8 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::TAO_ServerRequestInfo_CORB
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ConstantDef *tao_impl,
-    CORBA_IDLType_ptr type_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr type_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -3576,12 +3508,12 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::TAO_ServerRequestInfo_CORB
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -3597,25 +3529,25 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::arguments (CORBA::Environm
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -3623,7 +3555,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3632,11 +3564,11 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::target_most_derived_interf
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ConstantDef_value_get : public TAO_ServerRequestInfo
@@ -3645,36 +3577,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ConstantDef_value_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Any * result);
@@ -3691,45 +3619,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::TAO_ServerRequestInfo_CORBA_ConstantDef_value_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ConstantDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ConstantDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -3741,7 +3669,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3750,11 +3678,11 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -3771,36 +3699,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl
     ,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -3818,8 +3742,8 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::TAO_ServerRequestInfo_CORBA_C
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ConstantDef *tao_impl,
-    const CORBA::Any & value,
-    CORBA::Environment &
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -3827,12 +3751,12 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::TAO_ServerRequestInfo_CORBA_C
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -3848,25 +3772,25 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -3874,7 +3798,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3883,11 +3807,11 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -3919,18 +3843,18 @@ _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::~_TAO_CORBA_ConstantDef_Strateg
 
 _TAO_CORBA_ConstantDef_Proxy_Impl&
 _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_ConstantDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_ConstantDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -3939,8 +3863,8 @@ _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -4009,8 +3933,8 @@ _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ConstantDef_ThruPOA_Proxy_
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4025,8 +3949,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "type",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -4035,13 +3959,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type (
           "IDL:omg.org/CORBA/ConstantDef:1.0"
         )
     )->type (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4056,8 +3980,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -4066,14 +3990,14 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def (
           "IDL:omg.org/CORBA/ConstantDef:1.0"
         )
     )->type_def (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA_IDLType_ptr type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4086,8 +4010,8 @@ void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -4096,15 +4020,15 @@ void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def (
           "IDL:omg.org/CORBA/ConstantDef:1.0"
         )
     )->type_def (
-        type_def,
-        ACE_TRY_ENV
+        type_def
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::Any * _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4119,8 +4043,8 @@ CORBA::Any * _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "value",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -4129,14 +4053,14 @@ CORBA::Any * _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value (
           "IDL:omg.org/CORBA/ConstantDef:1.0"
         )
     )->value (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4149,8 +4073,8 @@ void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "value",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -4159,8 +4083,8 @@ void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value (
           "IDL:omg.org/CORBA/ConstantDef:1.0"
         )
     )->value (
-        value,
-        ACE_TRY_ENV
+        value
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -4190,8 +4114,8 @@ POA_CORBA_ConstantDef::~POA_CORBA_ConstantDef (void)
 void POA_CORBA_ConstantDef::_get_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ConstantDef *_tao_impl =
@@ -4211,19 +4135,19 @@ void POA_CORBA_ConstantDef::_get_type_skel (
   TAO_ServerRequestInfo_CORBA_ConstantDef_type_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->type (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -4232,20 +4156,20 @@ void POA_CORBA_ConstantDef::_get_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4267,16 +4191,13 @@ void POA_CORBA_ConstantDef::_get_type_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ConstantDef::_get_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ConstantDef *_tao_impl =
@@ -4296,19 +4217,19 @@ void POA_CORBA_ConstantDef::_get_type_def_skel (
   TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->type_def (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -4317,20 +4238,20 @@ void POA_CORBA_ConstantDef::_get_type_def_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4352,16 +4273,13 @@ void POA_CORBA_ConstantDef::_get_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ConstantDef::_set_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -4389,39 +4307,39 @@ void POA_CORBA_ConstantDef::_set_type_def_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      type_def.in (),
-      ACE_TRY_ENV
+      type_def.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->type_def (
-          type_def.in (),
-          ACE_TRY_ENV
+          type_def.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4436,16 +4354,13 @@ void POA_CORBA_ConstantDef::_set_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ConstantDef::_get_value_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ConstantDef *_tao_impl =
@@ -4465,19 +4380,19 @@ void POA_CORBA_ConstantDef::_get_value_skel (
   TAO_ServerRequestInfo_CORBA_ConstantDef_value_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->value (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -4486,20 +4401,20 @@ void POA_CORBA_ConstantDef::_get_value_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4521,16 +4436,13 @@ void POA_CORBA_ConstantDef::_get_value_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ConstantDef::_set_value_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -4558,39 +4470,39 @@ void POA_CORBA_ConstantDef::_set_value_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      value,
-      ACE_TRY_ENV
+      value
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->value (
-          value,
-          ACE_TRY_ENV
+          value
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4605,16 +4517,13 @@ void POA_CORBA_ConstantDef::_set_value_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ConstantDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -4624,7 +4533,7 @@ void POA_CORBA_ConstantDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -4636,12 +4545,12 @@ void POA_CORBA_ConstantDef::_is_a_skel (
 void POA_CORBA_ConstantDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ConstantDef *_tao_impl = (POA_CORBA_ConstantDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -4653,8 +4562,8 @@ void POA_CORBA_ConstantDef::_non_existent_skel (
 void POA_CORBA_ConstantDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ConstantDef *_tao_impl = (POA_CORBA_ConstantDef *) _tao_object_reference;
@@ -4673,7 +4582,7 @@ void POA_CORBA_ConstantDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -4699,11 +4608,11 @@ void POA_CORBA_ConstantDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_ConstantDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -4731,12 +4640,12 @@ void* POA_CORBA_ConstantDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_ConstantDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_ConstantDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -4746,9 +4655,9 @@ const char* POA_CORBA_ConstantDef::_interface_repository_id (void) const
 }
 
 CORBA_ConstantDef*
-POA_CORBA_ConstantDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_ConstantDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -4935,36 +4844,32 @@ public:
   TAO_ServerRequestInfo_CORBA_StructDef_members_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_StructDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_StructMemberSeq * result);
@@ -4981,45 +4886,45 @@ private:
 TAO_ServerRequestInfo_CORBA_StructDef_members_get::TAO_ServerRequestInfo_CORBA_StructDef_members_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_StructDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_StructDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_StructDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_StructDef_members_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_StructDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_StructDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_StructDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_StructDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5031,7 +4936,7 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_get::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_StructDef_members_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5040,11 +4945,11 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_StructDef_members_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5061,36 +4966,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_StructDef *tao_impl
     ,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -5108,8 +5009,8 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::TAO_ServerRequestInfo_CORBA_S
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_StructDef *tao_impl,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5117,12 +5018,12 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::TAO_ServerRequestInfo_CORBA_S
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_StructDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_StructDef_members_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5138,25 +5039,25 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_StructDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_StructDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_StructDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_StructDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -5164,7 +5065,7 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_StructDef_members_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5173,11 +5074,11 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_StructDef_members_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -5209,18 +5110,18 @@ _TAO_CORBA_StructDef_Strategized_Proxy_Broker::~_TAO_CORBA_StructDef_Strategized
 
 _TAO_CORBA_StructDef_Proxy_Impl&
 _TAO_CORBA_StructDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_StructDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_StructDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -5229,8 +5130,8 @@ _TAO_CORBA_StructDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_StructDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -5299,8 +5200,8 @@ _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::_TAO_CORBA_StructDef_ThruPOA_Proxy_Impl
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA_StructMemberSeq * _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5315,8 +5216,8 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "members",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -5325,14 +5226,14 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members (
           "IDL:omg.org/CORBA/StructDef:1.0"
         )
     )->members (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5345,8 +5246,8 @@ void _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "members",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -5355,8 +5256,8 @@ void _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members (
           "IDL:omg.org/CORBA/StructDef:1.0"
         )
     )->members (
-        members,
-        ACE_TRY_ENV
+        members
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -5389,8 +5290,8 @@ POA_CORBA_StructDef::~POA_CORBA_StructDef (void)
 void POA_CORBA_StructDef::_get_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_StructDef *_tao_impl =
@@ -5410,19 +5311,19 @@ void POA_CORBA_StructDef::_get_members_skel (
   TAO_ServerRequestInfo_CORBA_StructDef_members_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->members (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -5431,20 +5332,20 @@ void POA_CORBA_StructDef::_get_members_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -5466,16 +5367,13 @@ void POA_CORBA_StructDef::_get_members_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_StructDef::_set_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -5503,39 +5401,39 @@ void POA_CORBA_StructDef::_set_members_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      members,
-      ACE_TRY_ENV
+      members
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->members (
-          members,
-          ACE_TRY_ENV
+          members
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -5550,16 +5448,13 @@ void POA_CORBA_StructDef::_set_members_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_StructDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -5569,7 +5464,7 @@ void POA_CORBA_StructDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -5581,12 +5476,12 @@ void POA_CORBA_StructDef::_is_a_skel (
 void POA_CORBA_StructDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_StructDef *_tao_impl = (POA_CORBA_StructDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -5598,8 +5493,8 @@ void POA_CORBA_StructDef::_non_existent_skel (
 void POA_CORBA_StructDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_StructDef *_tao_impl = (POA_CORBA_StructDef *) _tao_object_reference;
@@ -5618,7 +5513,7 @@ void POA_CORBA_StructDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -5644,11 +5539,11 @@ void POA_CORBA_StructDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_StructDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -5685,12 +5580,12 @@ void* POA_CORBA_StructDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_StructDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_StructDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -5700,9 +5595,9 @@ const char* POA_CORBA_StructDef::_interface_repository_id (void) const
 }
 
 CORBA_StructDef*
-POA_CORBA_StructDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_StructDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -5892,36 +5787,32 @@ public:
   TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -5938,45 +5829,45 @@ private:
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_UnionDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_UnionDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5988,7 +5879,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::result (CORBA::Envi
 
 char *
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5997,11 +5888,11 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::target_most_derived
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6017,36 +5908,32 @@ public:
   TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_IDLType_ptr result);
@@ -6063,45 +5950,45 @@ private:
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_UnionDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_UnionDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6113,7 +6000,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (CORBA::
 
 char *
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6122,11 +6009,11 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::target_most_der
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6143,36 +6030,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl
     ,
-    CORBA_IDLType_ptr discriminator_type_def,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_IDLType_ptr discriminator_type_def
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -6190,8 +6073,8 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::TAO_ServerReque
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_UnionDef *tao_impl,
-    CORBA_IDLType_ptr discriminator_type_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr discriminator_type_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6199,12 +6082,12 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::TAO_ServerReque
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6220,25 +6103,25 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::arguments (CORB
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -6246,7 +6129,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::result (CORBA::
 
 char *
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6255,11 +6138,11 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::target_most_der
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_UnionDef_members_get : public TAO_ServerRequestInfo
@@ -6268,36 +6151,32 @@ public:
   TAO_ServerRequestInfo_CORBA_UnionDef_members_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_UnionMemberSeq * result);
@@ -6314,45 +6193,45 @@ private:
 TAO_ServerRequestInfo_CORBA_UnionDef_members_get::TAO_ServerRequestInfo_CORBA_UnionDef_members_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_UnionDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_UnionDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_UnionDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_members_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_UnionDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_UnionDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6364,7 +6243,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_get::result (CORBA::Environment &AC
 
 char *
 TAO_ServerRequestInfo_CORBA_UnionDef_members_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6373,11 +6252,11 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_UnionDef_members_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6394,36 +6273,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl
     ,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -6441,8 +6316,8 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::TAO_ServerRequestInfo_CORBA_Un
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_UnionDef *tao_impl,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6450,12 +6325,12 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::TAO_ServerRequestInfo_CORBA_Un
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_UnionDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_members_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6471,25 +6346,25 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_UnionDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_UnionDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -6497,7 +6372,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::result (CORBA::Environment &AC
 
 char *
 TAO_ServerRequestInfo_CORBA_UnionDef_members_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6506,11 +6381,11 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_UnionDef_members_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -6542,18 +6417,18 @@ _TAO_CORBA_UnionDef_Strategized_Proxy_Broker::~_TAO_CORBA_UnionDef_Strategized_P
 
 _TAO_CORBA_UnionDef_Proxy_Impl&
 _TAO_CORBA_UnionDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_UnionDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_UnionDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -6562,8 +6437,8 @@ _TAO_CORBA_UnionDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_UnionDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -6632,8 +6507,8 @@ _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::_TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl (
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6648,8 +6523,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "discriminator_type",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6658,13 +6533,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type (
           "IDL:omg.org/CORBA/UnionDef:1.0"
         )
     )->discriminator_type (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6679,8 +6554,8 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "discriminator_type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6689,14 +6564,14 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def
           "IDL:omg.org/CORBA/UnionDef:1.0"
         )
     )->discriminator_type_def (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA_IDLType_ptr discriminator_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr discriminator_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6709,8 +6584,8 @@ void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "discriminator_type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -6719,15 +6594,15 @@ void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
           "IDL:omg.org/CORBA/UnionDef:1.0"
         )
     )->discriminator_type_def (
-        discriminator_type_def,
-        ACE_TRY_ENV
+        discriminator_type_def
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6742,8 +6617,8 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "members",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6752,14 +6627,14 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members (
           "IDL:omg.org/CORBA/UnionDef:1.0"
         )
     )->members (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6772,8 +6647,8 @@ void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "members",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -6782,8 +6657,8 @@ void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members (
           "IDL:omg.org/CORBA/UnionDef:1.0"
         )
     )->members (
-        members,
-        ACE_TRY_ENV
+        members
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -6816,8 +6691,8 @@ POA_CORBA_UnionDef::~POA_CORBA_UnionDef (void)
 void POA_CORBA_UnionDef::_get_discriminator_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_UnionDef *_tao_impl =
@@ -6837,19 +6712,19 @@ void POA_CORBA_UnionDef::_get_discriminator_type_skel (
   TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->discriminator_type (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -6858,20 +6733,20 @@ void POA_CORBA_UnionDef::_get_discriminator_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6893,16 +6768,13 @@ void POA_CORBA_UnionDef::_get_discriminator_type_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_UnionDef::_get_discriminator_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_UnionDef *_tao_impl =
@@ -6922,19 +6794,19 @@ void POA_CORBA_UnionDef::_get_discriminator_type_def_skel (
   TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->discriminator_type_def (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -6943,20 +6815,20 @@ void POA_CORBA_UnionDef::_get_discriminator_type_def_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6978,16 +6850,13 @@ void POA_CORBA_UnionDef::_get_discriminator_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_UnionDef::_set_discriminator_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7015,39 +6884,39 @@ void POA_CORBA_UnionDef::_set_discriminator_type_def_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      discriminator_type_def.in (),
-      ACE_TRY_ENV
+      discriminator_type_def.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->discriminator_type_def (
-          discriminator_type_def.in (),
-          ACE_TRY_ENV
+          discriminator_type_def.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7062,16 +6931,13 @@ void POA_CORBA_UnionDef::_set_discriminator_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_UnionDef::_get_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_UnionDef *_tao_impl =
@@ -7091,19 +6957,19 @@ void POA_CORBA_UnionDef::_get_members_skel (
   TAO_ServerRequestInfo_CORBA_UnionDef_members_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->members (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7112,20 +6978,20 @@ void POA_CORBA_UnionDef::_get_members_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7147,16 +7013,13 @@ void POA_CORBA_UnionDef::_get_members_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_UnionDef::_set_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7184,39 +7047,39 @@ void POA_CORBA_UnionDef::_set_members_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      members,
-      ACE_TRY_ENV
+      members
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->members (
-          members,
-          ACE_TRY_ENV
+          members
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7231,16 +7094,13 @@ void POA_CORBA_UnionDef::_set_members_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_UnionDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7250,7 +7110,7 @@ void POA_CORBA_UnionDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -7262,12 +7122,12 @@ void POA_CORBA_UnionDef::_is_a_skel (
 void POA_CORBA_UnionDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_UnionDef *_tao_impl = (POA_CORBA_UnionDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -7279,8 +7139,8 @@ void POA_CORBA_UnionDef::_non_existent_skel (
 void POA_CORBA_UnionDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_UnionDef *_tao_impl = (POA_CORBA_UnionDef *) _tao_object_reference;
@@ -7299,7 +7159,7 @@ void POA_CORBA_UnionDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -7325,11 +7185,11 @@ void POA_CORBA_UnionDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_UnionDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -7366,12 +7226,12 @@ void* POA_CORBA_UnionDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_UnionDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_UnionDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -7381,9 +7241,9 @@ const char* POA_CORBA_UnionDef::_interface_repository_id (void) const
 }
 
 CORBA_UnionDef*
-POA_CORBA_UnionDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_UnionDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -7551,36 +7411,32 @@ public:
   TAO_ServerRequestInfo_CORBA_EnumDef_members_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_EnumDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_EnumMemberSeq * result);
@@ -7597,45 +7453,45 @@ private:
 TAO_ServerRequestInfo_CORBA_EnumDef_members_get::TAO_ServerRequestInfo_CORBA_EnumDef_members_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_EnumDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_EnumDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_EnumDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_EnumDef_members_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_EnumDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_EnumDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_EnumDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_EnumDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -7647,7 +7503,7 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_get::result (CORBA::Environment &ACE
 
 char *
 TAO_ServerRequestInfo_CORBA_EnumDef_members_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -7656,11 +7512,11 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_get::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_EnumDef_members_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -7677,36 +7533,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_EnumDef *tao_impl
     ,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -7724,8 +7576,8 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::TAO_ServerRequestInfo_CORBA_Enu
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_EnumDef *tao_impl,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -7733,12 +7585,12 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::TAO_ServerRequestInfo_CORBA_Enu
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_EnumDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_EnumDef_members_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -7754,25 +7606,25 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::arguments (CORBA::Environment &
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_EnumDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_EnumDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_EnumDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_EnumDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -7780,7 +7632,7 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::result (CORBA::Environment &ACE
 
 char *
 TAO_ServerRequestInfo_CORBA_EnumDef_members_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -7789,11 +7641,11 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_EnumDef_members_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -7825,18 +7677,18 @@ _TAO_CORBA_EnumDef_Strategized_Proxy_Broker::~_TAO_CORBA_EnumDef_Strategized_Pro
 
 _TAO_CORBA_EnumDef_Proxy_Impl&
 _TAO_CORBA_EnumDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_EnumDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_EnumDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -7845,8 +7697,8 @@ _TAO_CORBA_EnumDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_EnumDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -7915,8 +7767,8 @@ _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::_TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl (vo
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7931,8 +7783,8 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "members",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7941,14 +7793,14 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members (
           "IDL:omg.org/CORBA/EnumDef:1.0"
         )
     )->members (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7961,8 +7813,8 @@ void _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "members",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -7971,8 +7823,8 @@ void _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members (
           "IDL:omg.org/CORBA/EnumDef:1.0"
         )
     )->members (
-        members,
-        ACE_TRY_ENV
+        members
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -8004,8 +7856,8 @@ POA_CORBA_EnumDef::~POA_CORBA_EnumDef (void)
 void POA_CORBA_EnumDef::_get_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_EnumDef *_tao_impl =
@@ -8025,19 +7877,19 @@ void POA_CORBA_EnumDef::_get_members_skel (
   TAO_ServerRequestInfo_CORBA_EnumDef_members_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->members (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8046,20 +7898,20 @@ void POA_CORBA_EnumDef::_get_members_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8081,16 +7933,13 @@ void POA_CORBA_EnumDef::_get_members_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_EnumDef::_set_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8118,39 +7967,39 @@ void POA_CORBA_EnumDef::_set_members_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      members,
-      ACE_TRY_ENV
+      members
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->members (
-          members,
-          ACE_TRY_ENV
+          members
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8165,16 +8014,13 @@ void POA_CORBA_EnumDef::_set_members_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_EnumDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8184,7 +8030,7 @@ void POA_CORBA_EnumDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -8196,12 +8042,12 @@ void POA_CORBA_EnumDef::_is_a_skel (
 void POA_CORBA_EnumDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_EnumDef *_tao_impl = (POA_CORBA_EnumDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -8213,8 +8059,8 @@ void POA_CORBA_EnumDef::_non_existent_skel (
 void POA_CORBA_EnumDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_EnumDef *_tao_impl = (POA_CORBA_EnumDef *) _tao_object_reference;
@@ -8233,7 +8079,7 @@ void POA_CORBA_EnumDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -8259,11 +8105,11 @@ void POA_CORBA_EnumDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_EnumDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -8297,12 +8143,12 @@ void* POA_CORBA_EnumDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_EnumDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_EnumDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -8312,9 +8158,9 @@ const char* POA_CORBA_EnumDef::_interface_repository_id (void) const
 }
 
 CORBA_EnumDef*
-POA_CORBA_EnumDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_EnumDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -8482,36 +8328,32 @@ public:
   TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AliasDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_IDLType_ptr result);
@@ -8528,45 +8370,45 @@ private:
 TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_AliasDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_AliasDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -8578,7 +8420,7 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::result (CORBA::Envir
 
 char *
 TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -8587,11 +8429,11 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::target_most_derived_
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -8608,36 +8450,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AliasDef *tao_impl
     ,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -8655,8 +8493,8 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::TAO_ServerRequestInf
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_AliasDef *tao_impl,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -8664,12 +8502,12 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::TAO_ServerRequestInf
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -8685,25 +8523,25 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::arguments (CORBA::En
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -8711,7 +8549,7 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::result (CORBA::Envir
 
 char *
 TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -8720,11 +8558,11 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::target_most_derived_
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8756,18 +8594,18 @@ _TAO_CORBA_AliasDef_Strategized_Proxy_Broker::~_TAO_CORBA_AliasDef_Strategized_P
 
 _TAO_CORBA_AliasDef_Proxy_Impl&
 _TAO_CORBA_AliasDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_AliasDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_AliasDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -8776,8 +8614,8 @@ _TAO_CORBA_AliasDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_AliasDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -8846,8 +8684,8 @@ _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::_TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl (
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA_IDLType_ptr _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -8862,8 +8700,8 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "original_type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -8872,14 +8710,14 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
           "IDL:omg.org/CORBA/AliasDef:1.0"
         )
     )->original_type_def (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -8892,8 +8730,8 @@ void _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "original_type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -8902,8 +8740,8 @@ void _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
           "IDL:omg.org/CORBA/AliasDef:1.0"
         )
     )->original_type_def (
-        original_type_def,
-        ACE_TRY_ENV
+        original_type_def
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -8935,8 +8773,8 @@ POA_CORBA_AliasDef::~POA_CORBA_AliasDef (void)
 void POA_CORBA_AliasDef::_get_original_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_AliasDef *_tao_impl =
@@ -8956,19 +8794,19 @@ void POA_CORBA_AliasDef::_get_original_type_def_skel (
   TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->original_type_def (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8977,20 +8815,20 @@ void POA_CORBA_AliasDef::_get_original_type_def_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9012,16 +8850,13 @@ void POA_CORBA_AliasDef::_get_original_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_AliasDef::_set_original_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9049,39 +8884,39 @@ void POA_CORBA_AliasDef::_set_original_type_def_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      original_type_def.in (),
-      ACE_TRY_ENV
+      original_type_def.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->original_type_def (
-          original_type_def.in (),
-          ACE_TRY_ENV
+          original_type_def.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9096,16 +8931,13 @@ void POA_CORBA_AliasDef::_set_original_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_AliasDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9115,7 +8947,7 @@ void POA_CORBA_AliasDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9127,12 +8959,12 @@ void POA_CORBA_AliasDef::_is_a_skel (
 void POA_CORBA_AliasDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_AliasDef *_tao_impl = (POA_CORBA_AliasDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9144,8 +8976,8 @@ void POA_CORBA_AliasDef::_non_existent_skel (
 void POA_CORBA_AliasDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_AliasDef *_tao_impl = (POA_CORBA_AliasDef *) _tao_object_reference;
@@ -9164,7 +8996,7 @@ void POA_CORBA_AliasDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -9190,11 +9022,11 @@ void POA_CORBA_AliasDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_AliasDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -9228,12 +9060,12 @@ void* POA_CORBA_AliasDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_AliasDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_AliasDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -9243,9 +9075,9 @@ const char* POA_CORBA_AliasDef::_interface_repository_id (void) const
 }
 
 CORBA_AliasDef*
-POA_CORBA_AliasDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_AliasDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -9434,18 +9266,18 @@ _TAO_CORBA_NativeDef_Strategized_Proxy_Broker::~_TAO_CORBA_NativeDef_Strategized
 
 _TAO_CORBA_NativeDef_Proxy_Impl&
 _TAO_CORBA_NativeDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_NativeDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_NativeDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -9454,8 +9286,8 @@ _TAO_CORBA_NativeDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_NativeDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -9550,8 +9382,8 @@ POA_CORBA_NativeDef::~POA_CORBA_NativeDef (void)
 void POA_CORBA_NativeDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9561,7 +9393,7 @@ void POA_CORBA_NativeDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9573,12 +9405,12 @@ void POA_CORBA_NativeDef::_is_a_skel (
 void POA_CORBA_NativeDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_NativeDef *_tao_impl = (POA_CORBA_NativeDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9590,8 +9422,8 @@ void POA_CORBA_NativeDef::_non_existent_skel (
 void POA_CORBA_NativeDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_NativeDef *_tao_impl = (POA_CORBA_NativeDef *) _tao_object_reference;
@@ -9610,7 +9442,7 @@ void POA_CORBA_NativeDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -9636,11 +9468,11 @@ void POA_CORBA_NativeDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_NativeDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -9674,12 +9506,12 @@ void* POA_CORBA_NativeDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_NativeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_NativeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -9689,9 +9521,9 @@ const char* POA_CORBA_NativeDef::_interface_repository_id (void) const
 }
 
 CORBA_NativeDef*
-POA_CORBA_NativeDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_NativeDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -9827,36 +9659,32 @@ public:
   TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_PrimitiveDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::PrimitiveKind result);
@@ -9873,45 +9701,45 @@ private:
 TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_PrimitiveDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_PrimitiveDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -9923,7 +9751,7 @@ TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -9932,11 +9760,11 @@ TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -9975,18 +9803,18 @@ _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::~_TAO_CORBA_PrimitiveDef_Strat
 
 _TAO_CORBA_PrimitiveDef_Proxy_Impl&
 _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_PrimitiveDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_PrimitiveDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -9995,8 +9823,8 @@ _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -10065,8 +9893,8 @@ _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl::_TAO_CORBA_PrimitiveDef_ThruPOA_Prox
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl::kind (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -10081,8 +9909,8 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl::kind (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "kind",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -10091,7 +9919,7 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl::kind (
           "IDL:omg.org/CORBA/PrimitiveDef:1.0"
         )
     )->kind (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -10120,8 +9948,8 @@ POA_CORBA_PrimitiveDef::~POA_CORBA_PrimitiveDef (void)
 void POA_CORBA_PrimitiveDef::_get_kind_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_PrimitiveDef *_tao_impl =
@@ -10141,19 +9969,19 @@ void POA_CORBA_PrimitiveDef::_get_kind_skel (
   TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->kind (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -10161,20 +9989,20 @@ void POA_CORBA_PrimitiveDef::_get_kind_skel (
       CORBA::PrimitiveKind _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -10196,16 +10024,13 @@ void POA_CORBA_PrimitiveDef::_get_kind_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_PrimitiveDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -10215,7 +10040,7 @@ void POA_CORBA_PrimitiveDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10227,12 +10052,12 @@ void POA_CORBA_PrimitiveDef::_is_a_skel (
 void POA_CORBA_PrimitiveDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_PrimitiveDef *_tao_impl = (POA_CORBA_PrimitiveDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10244,8 +10069,8 @@ void POA_CORBA_PrimitiveDef::_non_existent_skel (
 void POA_CORBA_PrimitiveDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_PrimitiveDef *_tao_impl = (POA_CORBA_PrimitiveDef *) _tao_object_reference;
@@ -10264,7 +10089,7 @@ void POA_CORBA_PrimitiveDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -10290,11 +10115,11 @@ void POA_CORBA_PrimitiveDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_PrimitiveDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -10322,12 +10147,12 @@ void* POA_CORBA_PrimitiveDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_PrimitiveDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_PrimitiveDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -10337,9 +10162,9 @@ const char* POA_CORBA_PrimitiveDef::_interface_repository_id (void) const
 }
 
 CORBA_PrimitiveDef*
-POA_CORBA_PrimitiveDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_PrimitiveDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -10495,36 +10320,32 @@ public:
   TAO_ServerRequestInfo_CORBA_StringDef_bound_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_StringDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::ULong result);
@@ -10541,45 +10362,45 @@ private:
 TAO_ServerRequestInfo_CORBA_StringDef_bound_get::TAO_ServerRequestInfo_CORBA_StringDef_bound_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_StringDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_StringDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_StringDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_StringDef_bound_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_StringDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_StringDef_bound_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_StringDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_StringDef_bound_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -10591,7 +10412,7 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_get::result (CORBA::Environment &ACE
 
 char *
 TAO_ServerRequestInfo_CORBA_StringDef_bound_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -10600,11 +10421,11 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_get::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_StringDef_bound_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -10621,36 +10442,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_StringDef *tao_impl
     ,
-    const CORBA::ULong & bound,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::ULong & bound
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -10668,8 +10485,8 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::TAO_ServerRequestInfo_CORBA_Str
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_StringDef *tao_impl,
-    const CORBA::ULong & bound,
-    CORBA::Environment &
+    const CORBA::ULong & bound
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -10677,12 +10494,12 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::TAO_ServerRequestInfo_CORBA_Str
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_StringDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_StringDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -10698,25 +10515,25 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::arguments (CORBA::Environment &
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_StringDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_StringDef_bound_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_StringDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_StringDef_bound_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -10724,7 +10541,7 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::result (CORBA::Environment &ACE
 
 char *
 TAO_ServerRequestInfo_CORBA_StringDef_bound_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -10733,11 +10550,11 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_StringDef_bound_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -10769,18 +10586,18 @@ _TAO_CORBA_StringDef_Strategized_Proxy_Broker::~_TAO_CORBA_StringDef_Strategized
 
 _TAO_CORBA_StringDef_Proxy_Impl&
 _TAO_CORBA_StringDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_StringDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_StringDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -10789,8 +10606,8 @@ _TAO_CORBA_StringDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_StringDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -10859,8 +10676,8 @@ _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::_TAO_CORBA_StringDef_ThruPOA_Proxy_Impl
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::ULong _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -10875,8 +10692,8 @@ CORBA::ULong _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "bound",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -10885,14 +10702,14 @@ CORBA::ULong _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound (
           "IDL:omg.org/CORBA/StringDef:1.0"
         )
     )->bound (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -10905,8 +10722,8 @@ void _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "bound",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -10915,8 +10732,8 @@ void _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound (
           "IDL:omg.org/CORBA/StringDef:1.0"
         )
     )->bound (
-        bound,
-        ACE_TRY_ENV
+        bound
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -10946,8 +10763,8 @@ POA_CORBA_StringDef::~POA_CORBA_StringDef (void)
 void POA_CORBA_StringDef::_get_bound_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_StringDef *_tao_impl =
@@ -10967,19 +10784,19 @@ void POA_CORBA_StringDef::_get_bound_skel (
   TAO_ServerRequestInfo_CORBA_StringDef_bound_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->bound (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -10987,20 +10804,20 @@ void POA_CORBA_StringDef::_get_bound_skel (
       CORBA::ULong _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -11022,16 +10839,13 @@ void POA_CORBA_StringDef::_get_bound_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_StringDef::_set_bound_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -11059,39 +10873,39 @@ void POA_CORBA_StringDef::_set_bound_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      bound,
-      ACE_TRY_ENV
+      bound
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->bound (
-          bound,
-          ACE_TRY_ENV
+          bound
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -11106,16 +10920,13 @@ void POA_CORBA_StringDef::_set_bound_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_StringDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -11125,7 +10936,7 @@ void POA_CORBA_StringDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -11137,12 +10948,12 @@ void POA_CORBA_StringDef::_is_a_skel (
 void POA_CORBA_StringDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_StringDef *_tao_impl = (POA_CORBA_StringDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -11154,8 +10965,8 @@ void POA_CORBA_StringDef::_non_existent_skel (
 void POA_CORBA_StringDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_StringDef *_tao_impl = (POA_CORBA_StringDef *) _tao_object_reference;
@@ -11174,7 +10985,7 @@ void POA_CORBA_StringDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -11200,11 +11011,11 @@ void POA_CORBA_StringDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_StringDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -11232,12 +11043,12 @@ void* POA_CORBA_StringDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_StringDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_StringDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -11247,9 +11058,9 @@ const char* POA_CORBA_StringDef::_interface_repository_id (void) const
 }
 
 CORBA_StringDef*
-POA_CORBA_StringDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_StringDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -11405,36 +11216,32 @@ public:
   TAO_ServerRequestInfo_CORBA_WstringDef_bound_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_WstringDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::ULong result);
@@ -11451,45 +11258,45 @@ private:
 TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::TAO_ServerRequestInfo_CORBA_WstringDef_bound_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_WstringDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_WstringDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -11501,7 +11308,7 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::result (CORBA::Environment &AC
 
 char *
 TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -11510,11 +11317,11 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -11531,36 +11338,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_WstringDef *tao_impl
     ,
-    const CORBA::ULong & bound,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::ULong & bound
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -11578,8 +11381,8 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::TAO_ServerRequestInfo_CORBA_Ws
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_WstringDef *tao_impl,
-    const CORBA::ULong & bound,
-    CORBA::Environment &
+    const CORBA::ULong & bound
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -11587,12 +11390,12 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::TAO_ServerRequestInfo_CORBA_Ws
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -11608,25 +11411,25 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -11634,7 +11437,7 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::result (CORBA::Environment &AC
 
 char *
 TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -11643,11 +11446,11 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -11679,18 +11482,18 @@ _TAO_CORBA_WstringDef_Strategized_Proxy_Broker::~_TAO_CORBA_WstringDef_Strategiz
 
 _TAO_CORBA_WstringDef_Proxy_Impl&
 _TAO_CORBA_WstringDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_WstringDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_WstringDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -11699,8 +11502,8 @@ _TAO_CORBA_WstringDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_WstringDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -11769,8 +11572,8 @@ _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::_TAO_CORBA_WstringDef_ThruPOA_Proxy_Im
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::ULong _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -11785,8 +11588,8 @@ CORBA::ULong _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "bound",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -11795,14 +11598,14 @@ CORBA::ULong _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound (
           "IDL:omg.org/CORBA/WstringDef:1.0"
         )
     )->bound (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -11815,8 +11618,8 @@ void _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "bound",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -11825,8 +11628,8 @@ void _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound (
           "IDL:omg.org/CORBA/WstringDef:1.0"
         )
     )->bound (
-        bound,
-        ACE_TRY_ENV
+        bound
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -11856,8 +11659,8 @@ POA_CORBA_WstringDef::~POA_CORBA_WstringDef (void)
 void POA_CORBA_WstringDef::_get_bound_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_WstringDef *_tao_impl =
@@ -11877,19 +11680,19 @@ void POA_CORBA_WstringDef::_get_bound_skel (
   TAO_ServerRequestInfo_CORBA_WstringDef_bound_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->bound (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -11897,20 +11700,20 @@ void POA_CORBA_WstringDef::_get_bound_skel (
       CORBA::ULong _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -11932,16 +11735,13 @@ void POA_CORBA_WstringDef::_get_bound_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_WstringDef::_set_bound_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -11969,39 +11769,39 @@ void POA_CORBA_WstringDef::_set_bound_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      bound,
-      ACE_TRY_ENV
+      bound
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->bound (
-          bound,
-          ACE_TRY_ENV
+          bound
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -12016,16 +11816,13 @@ void POA_CORBA_WstringDef::_set_bound_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_WstringDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -12035,7 +11832,7 @@ void POA_CORBA_WstringDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -12047,12 +11844,12 @@ void POA_CORBA_WstringDef::_is_a_skel (
 void POA_CORBA_WstringDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_WstringDef *_tao_impl = (POA_CORBA_WstringDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -12064,8 +11861,8 @@ void POA_CORBA_WstringDef::_non_existent_skel (
 void POA_CORBA_WstringDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_WstringDef *_tao_impl = (POA_CORBA_WstringDef *) _tao_object_reference;
@@ -12084,7 +11881,7 @@ void POA_CORBA_WstringDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -12110,11 +11907,11 @@ void POA_CORBA_WstringDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_WstringDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -12142,12 +11939,12 @@ void* POA_CORBA_WstringDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_WstringDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_WstringDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -12157,9 +11954,9 @@ const char* POA_CORBA_WstringDef::_interface_repository_id (void) const
 }
 
 CORBA_WstringDef*
-POA_CORBA_WstringDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_WstringDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -12259,22 +12056,22 @@ TAO_CORBA_SequenceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
     {
       {"",0},{"",0},{"",0},{"",0},{"",0},
       {"_is_a",  &POA_CORBA_SequenceDef::_is_a_skel},
-      {"destroy", 	&POA_CORBA_SequenceDef::destroy_skel},
-      {"_get_bound", 	&POA_CORBA_SequenceDef::_get_bound_skel},
-      {"_set_bound", 	&POA_CORBA_SequenceDef::_set_bound_skel},
-      {"_get_def_kind", 	&POA_CORBA_SequenceDef::_get_def_kind_skel},
-      {"_get_type", 	&POA_CORBA_SequenceDef::_get_type_skel},
+      {"destroy",       &POA_CORBA_SequenceDef::destroy_skel},
+      {"_get_bound",    &POA_CORBA_SequenceDef::_get_bound_skel},
+      {"_set_bound",    &POA_CORBA_SequenceDef::_set_bound_skel},
+      {"_get_def_kind",         &POA_CORBA_SequenceDef::_get_def_kind_skel},
+      {"_get_type",     &POA_CORBA_SequenceDef::_get_type_skel},
       {"_interface",  &POA_CORBA_SequenceDef::_interface_skel},
       {"_non_existent",  &POA_CORBA_SequenceDef::_non_existent_skel},
-      {"_get_element_type_def", 	&POA_CORBA_SequenceDef::_get_element_type_def_skel},
-      {"_set_element_type_def", 	&POA_CORBA_SequenceDef::_set_element_type_def_skel},
-      {"_get_element_type", 	&POA_CORBA_SequenceDef::_get_element_type_skel},
+      {"_get_element_type_def",         &POA_CORBA_SequenceDef::_get_element_type_def_skel},
+      {"_set_element_type_def",         &POA_CORBA_SequenceDef::_set_element_type_def_skel},
+      {"_get_element_type",     &POA_CORBA_SequenceDef::_get_element_type_skel},
     };
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,  -1,   5,  -1,   6,  -7,  -2, -24,  -1,  -1,   9, 
-       10,  11,  -1,  -1,  12, -13,  -2, -24,  15, 
+       -1,  -1,  -1,  -1,  -1,   5,  -1,   6,  -7,  -2, -24,  -1,  -1,   9,
+       10,  11,  -1,  -1,  12, -13,  -2, -24,  15,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -12318,36 +12115,32 @@ public:
   TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::ULong result);
@@ -12364,45 +12157,45 @@ private:
 TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_SequenceDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_SequenceDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -12414,7 +12207,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -12423,11 +12216,11 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -12444,36 +12237,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl
     ,
-    const CORBA::ULong & bound,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::ULong & bound
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -12491,8 +12280,8 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::TAO_ServerRequestInfo_CORBA_S
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_SequenceDef *tao_impl,
-    const CORBA::ULong & bound,
-    CORBA::Environment &
+    const CORBA::ULong & bound
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -12500,12 +12289,12 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::TAO_ServerRequestInfo_CORBA_S
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -12521,25 +12310,25 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -12547,7 +12336,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -12556,11 +12345,11 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get : public TAO_ServerRequestInfo
@@ -12569,36 +12358,32 @@ public:
   TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -12615,45 +12400,45 @@ private:
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_SequenceDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_SequenceDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -12665,7 +12450,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::result (CORBA::Environ
 
 char *
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -12674,11 +12459,11 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::target_most_derived_in
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -12694,36 +12479,32 @@ public:
   TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_IDLType_ptr result);
@@ -12740,45 +12521,45 @@ private:
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_SequenceDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_SequenceDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -12790,7 +12571,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::result (CORBA::Env
 
 char *
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -12799,11 +12580,11 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::target_most_derive
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -12820,36 +12601,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl
     ,
-    CORBA_IDLType_ptr element_type_def,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_IDLType_ptr element_type_def
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -12867,8 +12644,8 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::TAO_ServerRequestI
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_SequenceDef *tao_impl,
-    CORBA_IDLType_ptr element_type_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr element_type_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -12876,12 +12653,12 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::TAO_ServerRequestI
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -12897,25 +12674,25 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::arguments (CORBA::
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -12923,7 +12700,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::result (CORBA::Env
 
 char *
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -12932,11 +12709,11 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::target_most_derive
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -12968,18 +12745,18 @@ _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::~_TAO_CORBA_SequenceDef_Strateg
 
 _TAO_CORBA_SequenceDef_Proxy_Impl&
 _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_SequenceDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_SequenceDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -12988,8 +12765,8 @@ _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -13058,8 +12835,8 @@ _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::_TAO_CORBA_SequenceDef_ThruPOA_Proxy_
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::ULong _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -13074,8 +12851,8 @@ CORBA::ULong _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "bound",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -13084,14 +12861,14 @@ CORBA::ULong _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound (
           "IDL:omg.org/CORBA/SequenceDef:1.0"
         )
     )->bound (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -13104,8 +12881,8 @@ void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "bound",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -13114,15 +12891,15 @@ void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound (
           "IDL:omg.org/CORBA/SequenceDef:1.0"
         )
     )->bound (
-        bound,
-        ACE_TRY_ENV
+        bound
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -13137,8 +12914,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "element_type",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -13147,13 +12924,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type (
           "IDL:omg.org/CORBA/SequenceDef:1.0"
         )
     )->element_type (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -13168,8 +12945,8 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "element_type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -13178,14 +12955,14 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
           "IDL:omg.org/CORBA/SequenceDef:1.0"
         )
     )->element_type_def (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA_IDLType_ptr element_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr element_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -13198,8 +12975,8 @@ void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "element_type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -13208,8 +12985,8 @@ void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
           "IDL:omg.org/CORBA/SequenceDef:1.0"
         )
     )->element_type_def (
-        element_type_def,
-        ACE_TRY_ENV
+        element_type_def
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -13239,8 +13016,8 @@ POA_CORBA_SequenceDef::~POA_CORBA_SequenceDef (void)
 void POA_CORBA_SequenceDef::_get_bound_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_SequenceDef *_tao_impl =
@@ -13260,19 +13037,19 @@ void POA_CORBA_SequenceDef::_get_bound_skel (
   TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->bound (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13280,20 +13057,20 @@ void POA_CORBA_SequenceDef::_get_bound_skel (
       CORBA::ULong _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13315,16 +13092,13 @@ void POA_CORBA_SequenceDef::_get_bound_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_SequenceDef::_set_bound_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -13352,39 +13126,39 @@ void POA_CORBA_SequenceDef::_set_bound_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      bound,
-      ACE_TRY_ENV
+      bound
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->bound (
-          bound,
-          ACE_TRY_ENV
+          bound
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13399,16 +13173,13 @@ void POA_CORBA_SequenceDef::_set_bound_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_SequenceDef::_get_element_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_SequenceDef *_tao_impl =
@@ -13428,19 +13199,19 @@ void POA_CORBA_SequenceDef::_get_element_type_skel (
   TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->element_type (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13449,20 +13220,20 @@ void POA_CORBA_SequenceDef::_get_element_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13484,16 +13255,13 @@ void POA_CORBA_SequenceDef::_get_element_type_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_SequenceDef::_get_element_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_SequenceDef *_tao_impl =
@@ -13513,19 +13281,19 @@ void POA_CORBA_SequenceDef::_get_element_type_def_skel (
   TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->element_type_def (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13534,20 +13302,20 @@ void POA_CORBA_SequenceDef::_get_element_type_def_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13569,16 +13337,13 @@ void POA_CORBA_SequenceDef::_get_element_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_SequenceDef::_set_element_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -13606,39 +13371,39 @@ void POA_CORBA_SequenceDef::_set_element_type_def_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      element_type_def.in (),
-      ACE_TRY_ENV
+      element_type_def.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->element_type_def (
-          element_type_def.in (),
-          ACE_TRY_ENV
+          element_type_def.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13653,16 +13418,13 @@ void POA_CORBA_SequenceDef::_set_element_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_SequenceDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -13672,7 +13434,7 @@ void POA_CORBA_SequenceDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -13684,12 +13446,12 @@ void POA_CORBA_SequenceDef::_is_a_skel (
 void POA_CORBA_SequenceDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_SequenceDef *_tao_impl = (POA_CORBA_SequenceDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -13701,8 +13463,8 @@ void POA_CORBA_SequenceDef::_non_existent_skel (
 void POA_CORBA_SequenceDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_SequenceDef *_tao_impl = (POA_CORBA_SequenceDef *) _tao_object_reference;
@@ -13721,7 +13483,7 @@ void POA_CORBA_SequenceDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -13747,11 +13509,11 @@ void POA_CORBA_SequenceDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_SequenceDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -13779,12 +13541,12 @@ void* POA_CORBA_SequenceDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_SequenceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_SequenceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -13794,9 +13556,9 @@ const char* POA_CORBA_SequenceDef::_interface_repository_id (void) const
 }
 
 CORBA_SequenceDef*
-POA_CORBA_SequenceDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_SequenceDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -13955,36 +13717,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ArrayDef_length_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::ULong result);
@@ -14001,45 +13759,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::TAO_ServerRequestInfo_CORBA_ArrayDef_length_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ArrayDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ArrayDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -14051,7 +13809,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::result (CORBA::Environment &ACE
 
 char *
 TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -14060,11 +13818,11 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -14081,36 +13839,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl
     ,
-    const CORBA::ULong & length,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::ULong & length
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -14128,8 +13882,8 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::TAO_ServerRequestInfo_CORBA_Arr
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ArrayDef *tao_impl,
-    const CORBA::ULong & length,
-    CORBA::Environment &
+    const CORBA::ULong & length
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -14137,12 +13891,12 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::TAO_ServerRequestInfo_CORBA_Arr
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -14158,25 +13912,25 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::arguments (CORBA::Environment &
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -14184,7 +13938,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::result (CORBA::Environment &ACE
 
 char *
 TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -14193,11 +13947,11 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get : public TAO_ServerRequestInfo
@@ -14206,36 +13960,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -14252,45 +14002,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ArrayDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ArrayDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -14302,7 +14052,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -14311,11 +14061,11 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -14331,36 +14081,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_IDLType_ptr result);
@@ -14377,45 +14123,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ArrayDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ArrayDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -14427,7 +14173,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::result (CORBA::Enviro
 
 char *
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -14436,11 +14182,11 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::target_most_derived_i
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -14457,36 +14203,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl
     ,
-    CORBA_IDLType_ptr element_type_def,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_IDLType_ptr element_type_def
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -14504,8 +14246,8 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::TAO_ServerRequestInfo
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ArrayDef *tao_impl,
-    CORBA_IDLType_ptr element_type_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr element_type_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -14513,12 +14255,12 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::TAO_ServerRequestInfo
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -14534,25 +14276,25 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::arguments (CORBA::Env
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -14560,7 +14302,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::result (CORBA::Enviro
 
 char *
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -14569,11 +14311,11 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::target_most_derived_i
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -14605,18 +14347,18 @@ _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::~_TAO_CORBA_ArrayDef_Strategized_P
 
 _TAO_CORBA_ArrayDef_Proxy_Impl&
 _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_ArrayDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_ArrayDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -14625,8 +14367,8 @@ _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -14695,8 +14437,8 @@ _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl (
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::ULong _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -14711,8 +14453,8 @@ CORBA::ULong _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "length",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -14721,14 +14463,14 @@ CORBA::ULong _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length (
           "IDL:omg.org/CORBA/ArrayDef:1.0"
         )
     )->length (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::ULong length,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong length
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -14741,8 +14483,8 @@ void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "length",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -14751,15 +14493,15 @@ void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length (
           "IDL:omg.org/CORBA/ArrayDef:1.0"
         )
     )->length (
-        length,
-        ACE_TRY_ENV
+        length
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -14774,8 +14516,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "element_type",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -14784,13 +14526,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type (
           "IDL:omg.org/CORBA/ArrayDef:1.0"
         )
     )->element_type (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -14805,8 +14547,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "element_type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -14815,14 +14557,14 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
           "IDL:omg.org/CORBA/ArrayDef:1.0"
         )
     )->element_type_def (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA_IDLType_ptr element_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr element_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -14835,8 +14577,8 @@ void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "element_type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -14845,8 +14587,8 @@ void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
           "IDL:omg.org/CORBA/ArrayDef:1.0"
         )
     )->element_type_def (
-        element_type_def,
-        ACE_TRY_ENV
+        element_type_def
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -14876,8 +14618,8 @@ POA_CORBA_ArrayDef::~POA_CORBA_ArrayDef (void)
 void POA_CORBA_ArrayDef::_get_length_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ArrayDef *_tao_impl =
@@ -14897,19 +14639,19 @@ void POA_CORBA_ArrayDef::_get_length_skel (
   TAO_ServerRequestInfo_CORBA_ArrayDef_length_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->length (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -14917,20 +14659,20 @@ void POA_CORBA_ArrayDef::_get_length_skel (
       CORBA::ULong _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -14952,16 +14694,13 @@ void POA_CORBA_ArrayDef::_get_length_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ArrayDef::_set_length_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -14989,39 +14728,39 @@ void POA_CORBA_ArrayDef::_set_length_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      length,
-      ACE_TRY_ENV
+      length
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->length (
-          length,
-          ACE_TRY_ENV
+          length
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -15036,16 +14775,13 @@ void POA_CORBA_ArrayDef::_set_length_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ArrayDef::_get_element_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ArrayDef *_tao_impl =
@@ -15065,19 +14801,19 @@ void POA_CORBA_ArrayDef::_get_element_type_skel (
   TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->element_type (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -15086,20 +14822,20 @@ void POA_CORBA_ArrayDef::_get_element_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -15121,16 +14857,13 @@ void POA_CORBA_ArrayDef::_get_element_type_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ArrayDef::_get_element_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ArrayDef *_tao_impl =
@@ -15150,19 +14883,19 @@ void POA_CORBA_ArrayDef::_get_element_type_def_skel (
   TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->element_type_def (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -15171,20 +14904,20 @@ void POA_CORBA_ArrayDef::_get_element_type_def_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -15206,16 +14939,13 @@ void POA_CORBA_ArrayDef::_get_element_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ArrayDef::_set_element_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -15243,39 +14973,39 @@ void POA_CORBA_ArrayDef::_set_element_type_def_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      element_type_def.in (),
-      ACE_TRY_ENV
+      element_type_def.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->element_type_def (
-          element_type_def.in (),
-          ACE_TRY_ENV
+          element_type_def.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -15290,16 +15020,13 @@ void POA_CORBA_ArrayDef::_set_element_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ArrayDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -15309,7 +15036,7 @@ void POA_CORBA_ArrayDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -15321,12 +15048,12 @@ void POA_CORBA_ArrayDef::_is_a_skel (
 void POA_CORBA_ArrayDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ArrayDef *_tao_impl = (POA_CORBA_ArrayDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -15338,8 +15065,8 @@ void POA_CORBA_ArrayDef::_non_existent_skel (
 void POA_CORBA_ArrayDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ArrayDef *_tao_impl = (POA_CORBA_ArrayDef *) _tao_object_reference;
@@ -15358,7 +15085,7 @@ void POA_CORBA_ArrayDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -15384,11 +15111,11 @@ void POA_CORBA_ArrayDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_ArrayDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -15416,12 +15143,12 @@ void* POA_CORBA_ArrayDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_ArrayDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_ArrayDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -15431,9 +15158,9 @@ const char* POA_CORBA_ArrayDef::_interface_repository_id (void) const
 }
 
 CORBA_ArrayDef*
-POA_CORBA_ArrayDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_ArrayDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -15620,36 +15347,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ExceptionDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -15666,45 +15389,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ExceptionDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ExceptionDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -15716,7 +15439,7 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -15725,11 +15448,11 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -15745,36 +15468,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ExceptionDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_StructMemberSeq * result);
@@ -15791,45 +15510,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ExceptionDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ExceptionDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -15841,7 +15560,7 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -15850,11 +15569,11 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::target_most_derived_interf
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -15871,36 +15590,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ExceptionDef *tao_impl
     ,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -15918,8 +15633,8 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::TAO_ServerRequestInfo_CORB
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ExceptionDef *tao_impl,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -15927,12 +15642,12 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::TAO_ServerRequestInfo_CORB
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -15948,25 +15663,25 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::arguments (CORBA::Environm
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -15974,7 +15689,7 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -15983,11 +15698,11 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::target_most_derived_interf
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -16019,18 +15734,18 @@ _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::~_TAO_CORBA_ExceptionDef_Strat
 
 _TAO_CORBA_ExceptionDef_Proxy_Impl&
 _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_ExceptionDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_ExceptionDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -16039,8 +15754,8 @@ _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -16109,8 +15824,8 @@ _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ExceptionDef_ThruPOA_Prox
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::type (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -16125,8 +15840,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::type (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "type",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -16135,13 +15850,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::type (
           "IDL:omg.org/CORBA/ExceptionDef:1.0"
         )
     )->type (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -16156,8 +15871,8 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "members",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -16166,14 +15881,14 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members (
           "IDL:omg.org/CORBA/ExceptionDef:1.0"
         )
     )->members (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -16186,8 +15901,8 @@ void _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "members",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -16196,8 +15911,8 @@ void _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members (
           "IDL:omg.org/CORBA/ExceptionDef:1.0"
         )
     )->members (
-        members,
-        ACE_TRY_ENV
+        members
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -16228,8 +15943,8 @@ POA_CORBA_ExceptionDef::~POA_CORBA_ExceptionDef (void)
 void POA_CORBA_ExceptionDef::_get_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ExceptionDef *_tao_impl =
@@ -16249,19 +15964,19 @@ void POA_CORBA_ExceptionDef::_get_type_skel (
   TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->type (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -16270,20 +15985,20 @@ void POA_CORBA_ExceptionDef::_get_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -16305,16 +16020,13 @@ void POA_CORBA_ExceptionDef::_get_type_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ExceptionDef::_get_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ExceptionDef *_tao_impl =
@@ -16334,19 +16046,19 @@ void POA_CORBA_ExceptionDef::_get_members_skel (
   TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->members (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -16355,20 +16067,20 @@ void POA_CORBA_ExceptionDef::_get_members_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -16390,16 +16102,13 @@ void POA_CORBA_ExceptionDef::_get_members_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ExceptionDef::_set_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -16427,39 +16136,39 @@ void POA_CORBA_ExceptionDef::_set_members_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      members,
-      ACE_TRY_ENV
+      members
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->members (
-          members,
-          ACE_TRY_ENV
+          members
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -16474,16 +16183,13 @@ void POA_CORBA_ExceptionDef::_set_members_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ExceptionDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -16493,7 +16199,7 @@ void POA_CORBA_ExceptionDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -16505,12 +16211,12 @@ void POA_CORBA_ExceptionDef::_is_a_skel (
 void POA_CORBA_ExceptionDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ExceptionDef *_tao_impl = (POA_CORBA_ExceptionDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -16522,8 +16228,8 @@ void POA_CORBA_ExceptionDef::_non_existent_skel (
 void POA_CORBA_ExceptionDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ExceptionDef *_tao_impl = (POA_CORBA_ExceptionDef *) _tao_object_reference;
@@ -16542,7 +16248,7 @@ void POA_CORBA_ExceptionDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -16568,11 +16274,11 @@ void POA_CORBA_ExceptionDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_ExceptionDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -16603,12 +16309,12 @@ void* POA_CORBA_ExceptionDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_ExceptionDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_ExceptionDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -16618,9 +16324,9 @@ const char* POA_CORBA_ExceptionDef::_interface_repository_id (void) const
 }
 
 CORBA_ExceptionDef*
-POA_CORBA_ExceptionDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_ExceptionDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -16790,36 +16496,32 @@ public:
   TAO_ServerRequestInfo_CORBA_AttributeDef_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -16836,45 +16538,45 @@ private:
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::TAO_ServerRequestInfo_CORBA_AttributeDef_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_AttributeDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_AttributeDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -16886,7 +16588,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -16895,11 +16597,11 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -16915,36 +16617,32 @@ public:
   TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_IDLType_ptr result);
@@ -16961,45 +16659,45 @@ private:
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_AttributeDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_AttributeDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -17011,7 +16709,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -17020,11 +16718,11 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -17041,36 +16739,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl
     ,
-    CORBA_IDLType_ptr type_def,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_IDLType_ptr type_def
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -17088,8 +16782,8 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::TAO_ServerRequestInfo_COR
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_AttributeDef *tao_impl,
-    CORBA_IDLType_ptr type_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr type_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -17097,12 +16791,12 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::TAO_ServerRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -17118,25 +16812,25 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -17144,7 +16838,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -17153,11 +16847,11 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get : public TAO_ServerRequestInfo
@@ -17166,36 +16860,32 @@ public:
   TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::AttributeMode result);
@@ -17212,45 +16902,45 @@ private:
 TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_AttributeDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_AttributeDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -17262,7 +16952,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -17271,11 +16961,11 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -17292,36 +16982,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl
     ,
-    CORBA::AttributeMode & mode,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA::AttributeMode & mode
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -17339,8 +17025,8 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::TAO_ServerRequestInfo_CORBA_A
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_AttributeDef *tao_impl,
-    CORBA::AttributeMode & mode,
-    CORBA::Environment &
+    CORBA::AttributeMode & mode
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -17348,12 +17034,12 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::TAO_ServerRequestInfo_CORBA_A
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -17369,25 +17055,25 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -17395,7 +17081,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -17404,11 +17090,11 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -17440,18 +17126,18 @@ _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::~_TAO_CORBA_AttributeDef_Strat
 
 _TAO_CORBA_AttributeDef_Proxy_Impl&
 _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_AttributeDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_AttributeDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -17460,8 +17146,8 @@ _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -17530,8 +17216,8 @@ _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::_TAO_CORBA_AttributeDef_ThruPOA_Prox
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -17546,8 +17232,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "type",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -17556,13 +17242,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type (
           "IDL:omg.org/CORBA/AttributeDef:1.0"
         )
     )->type (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -17577,8 +17263,8 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -17587,14 +17273,14 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def (
           "IDL:omg.org/CORBA/AttributeDef:1.0"
         )
     )->type_def (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA_IDLType_ptr type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -17607,8 +17293,8 @@ void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -17617,15 +17303,15 @@ void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def (
           "IDL:omg.org/CORBA/AttributeDef:1.0"
         )
     )->type_def (
-        type_def,
-        ACE_TRY_ENV
+        type_def
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::AttributeMode _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -17640,8 +17326,8 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "mode",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -17650,14 +17336,14 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode (
           "IDL:omg.org/CORBA/AttributeDef:1.0"
         )
     )->mode (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::AttributeMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -17670,8 +17356,8 @@ void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "mode",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -17680,8 +17366,8 @@ void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode (
           "IDL:omg.org/CORBA/AttributeDef:1.0"
         )
     )->mode (
-        mode,
-        ACE_TRY_ENV
+        mode
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -17711,8 +17397,8 @@ POA_CORBA_AttributeDef::~POA_CORBA_AttributeDef (void)
 void POA_CORBA_AttributeDef::_get_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_AttributeDef *_tao_impl =
@@ -17732,19 +17418,19 @@ void POA_CORBA_AttributeDef::_get_type_skel (
   TAO_ServerRequestInfo_CORBA_AttributeDef_type_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->type (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -17753,20 +17439,20 @@ void POA_CORBA_AttributeDef::_get_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -17788,16 +17474,13 @@ void POA_CORBA_AttributeDef::_get_type_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_AttributeDef::_get_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_AttributeDef *_tao_impl =
@@ -17817,19 +17500,19 @@ void POA_CORBA_AttributeDef::_get_type_def_skel (
   TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->type_def (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -17838,20 +17521,20 @@ void POA_CORBA_AttributeDef::_get_type_def_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -17873,16 +17556,13 @@ void POA_CORBA_AttributeDef::_get_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_AttributeDef::_set_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -17910,39 +17590,39 @@ void POA_CORBA_AttributeDef::_set_type_def_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      type_def.in (),
-      ACE_TRY_ENV
+      type_def.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->type_def (
-          type_def.in (),
-          ACE_TRY_ENV
+          type_def.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -17957,16 +17637,13 @@ void POA_CORBA_AttributeDef::_set_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_AttributeDef::_get_mode_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_AttributeDef *_tao_impl =
@@ -17986,19 +17663,19 @@ void POA_CORBA_AttributeDef::_get_mode_skel (
   TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->mode (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -18006,20 +17683,20 @@ void POA_CORBA_AttributeDef::_get_mode_skel (
       CORBA::AttributeMode _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -18041,16 +17718,13 @@ void POA_CORBA_AttributeDef::_get_mode_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_AttributeDef::_set_mode_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -18078,39 +17752,39 @@ void POA_CORBA_AttributeDef::_set_mode_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      mode,
-      ACE_TRY_ENV
+      mode
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->mode (
-          mode,
-          ACE_TRY_ENV
+          mode
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -18125,16 +17799,13 @@ void POA_CORBA_AttributeDef::_set_mode_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_AttributeDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -18144,7 +17815,7 @@ void POA_CORBA_AttributeDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -18156,12 +17827,12 @@ void POA_CORBA_AttributeDef::_is_a_skel (
 void POA_CORBA_AttributeDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_AttributeDef *_tao_impl = (POA_CORBA_AttributeDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -18173,8 +17844,8 @@ void POA_CORBA_AttributeDef::_non_existent_skel (
 void POA_CORBA_AttributeDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_AttributeDef *_tao_impl = (POA_CORBA_AttributeDef *) _tao_object_reference;
@@ -18193,7 +17864,7 @@ void POA_CORBA_AttributeDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -18219,11 +17890,11 @@ void POA_CORBA_AttributeDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_AttributeDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -18251,12 +17922,12 @@ void* POA_CORBA_AttributeDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_AttributeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_AttributeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -18266,9 +17937,9 @@ const char* POA_CORBA_AttributeDef::_interface_repository_id (void) const
 }
 
 CORBA_AttributeDef*
-POA_CORBA_AttributeDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_AttributeDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -18495,36 +18166,32 @@ public:
   TAO_ServerRequestInfo_CORBA_OperationDef_result_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -18541,45 +18208,45 @@ private:
 TAO_ServerRequestInfo_CORBA_OperationDef_result_get::TAO_ServerRequestInfo_CORBA_OperationDef_result_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_OperationDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_OperationDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_result_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_result_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_result_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_result_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_result_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_result_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -18591,7 +18258,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_get::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_result_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -18600,11 +18267,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_get::target_most_derived_interfa
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_result_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -18620,36 +18287,32 @@ public:
   TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_IDLType_ptr result);
@@ -18666,45 +18329,45 @@ private:
 TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_OperationDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_OperationDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -18716,7 +18379,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::result (CORBA::Environm
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -18725,11 +18388,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::target_most_derived_int
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -18746,36 +18409,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
     ,
-    CORBA_IDLType_ptr result_def,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_IDLType_ptr result_def
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -18793,8 +18452,8 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::TAO_ServerRequestInfo_C
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_OperationDef *tao_impl,
-    CORBA_IDLType_ptr result_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr result_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -18802,12 +18461,12 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::TAO_ServerRequestInfo_C
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -18823,25 +18482,25 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::arguments (CORBA::Envir
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -18849,7 +18508,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::result (CORBA::Environm
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -18858,11 +18517,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::target_most_derived_int
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_OperationDef_params_get : public TAO_ServerRequestInfo
@@ -18871,36 +18530,32 @@ public:
   TAO_ServerRequestInfo_CORBA_OperationDef_params_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ParDescriptionSeq * result);
@@ -18917,45 +18572,45 @@ private:
 TAO_ServerRequestInfo_CORBA_OperationDef_params_get::TAO_ServerRequestInfo_CORBA_OperationDef_params_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_OperationDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_OperationDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_params_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_params_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_params_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_params_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_params_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_params_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -18967,7 +18622,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_get::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_params_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -18976,11 +18631,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_get::target_most_derived_interfa
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_params_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -18997,36 +18652,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
     ,
-    const CORBA_ParDescriptionSeq & params,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_ParDescriptionSeq & params
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -19044,8 +18695,8 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::TAO_ServerRequestInfo_CORBA
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_OperationDef *tao_impl,
-    const CORBA_ParDescriptionSeq & params,
-    CORBA::Environment &
+    const CORBA_ParDescriptionSeq & params
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -19053,12 +18704,12 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::TAO_ServerRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_params_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_params_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -19074,25 +18725,25 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::arguments (CORBA::Environme
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_params_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_params_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_params_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_params_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -19100,7 +18751,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_params_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -19109,11 +18760,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::target_most_derived_interfa
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_params_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_OperationDef_mode_get : public TAO_ServerRequestInfo
@@ -19122,36 +18773,32 @@ public:
   TAO_ServerRequestInfo_CORBA_OperationDef_mode_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::OperationMode result);
@@ -19168,45 +18815,45 @@ private:
 TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::TAO_ServerRequestInfo_CORBA_OperationDef_mode_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_OperationDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_OperationDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -19218,7 +18865,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -19227,11 +18874,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -19248,36 +18895,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
     ,
-    CORBA::OperationMode & mode,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA::OperationMode & mode
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -19295,8 +18938,8 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::TAO_ServerRequestInfo_CORBA_O
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_OperationDef *tao_impl,
-    CORBA::OperationMode & mode,
-    CORBA::Environment &
+    CORBA::OperationMode & mode
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -19304,12 +18947,12 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::TAO_ServerRequestInfo_CORBA_O
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -19325,25 +18968,25 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -19351,7 +18994,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -19360,11 +19003,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get : public TAO_ServerRequestInfo
@@ -19373,36 +19016,32 @@ public:
   TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ContextIdSeq * result);
@@ -19419,45 +19058,45 @@ private:
 TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_OperationDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_OperationDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -19469,7 +19108,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -19478,11 +19117,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -19499,36 +19138,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
     ,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -19546,8 +19181,8 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::TAO_ServerRequestInfo_COR
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_OperationDef *tao_impl,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -19555,12 +19190,12 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::TAO_ServerRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -19576,25 +19211,25 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -19602,7 +19237,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -19611,11 +19246,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get : public TAO_ServerRequestInfo
@@ -19624,36 +19259,32 @@ public:
   TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ExceptionDefSeq * result);
@@ -19670,45 +19301,45 @@ private:
 TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_OperationDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_OperationDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -19720,7 +19351,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::result (CORBA::Environm
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -19729,11 +19360,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::target_most_derived_int
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -19750,36 +19381,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
     ,
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -19797,8 +19424,8 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::TAO_ServerRequestInfo_C
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_OperationDef *tao_impl,
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -19806,12 +19433,12 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::TAO_ServerRequestInfo_C
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -19827,25 +19454,25 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::arguments (CORBA::Envir
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -19853,7 +19480,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::result (CORBA::Environm
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -19862,11 +19489,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::target_most_derived_int
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -19898,18 +19525,18 @@ _TAO_CORBA_OperationDef_Strategized_Proxy_Broker::~_TAO_CORBA_OperationDef_Strat
 
 _TAO_CORBA_OperationDef_Proxy_Impl&
 _TAO_CORBA_OperationDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_OperationDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_OperationDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -19918,8 +19545,8 @@ _TAO_CORBA_OperationDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_OperationDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -19988,8 +19615,8 @@ _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::_TAO_CORBA_OperationDef_ThruPOA_Prox
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -20004,8 +19631,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "result",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -20014,13 +19641,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->result (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -20035,8 +19662,8 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "result_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -20045,14 +19672,14 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->result_def (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA_IDLType_ptr result_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr result_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -20065,8 +19692,8 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "result_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -20075,15 +19702,15 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->result_def (
-        result_def,
-        ACE_TRY_ENV
+        result_def
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -20098,8 +19725,8 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "params",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -20108,14 +19735,14 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->params (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA_ParDescriptionSeq & params,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ParDescriptionSeq & params
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -20128,8 +19755,8 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "params",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -20138,15 +19765,15 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->params (
-        params,
-        ACE_TRY_ENV
+        params
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::OperationMode _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -20161,8 +19788,8 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "mode",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -20171,14 +19798,14 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->mode (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::OperationMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::OperationMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -20191,8 +19818,8 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "mode",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -20201,15 +19828,15 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->mode (
-        mode,
-        ACE_TRY_ENV
+        mode
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -20224,8 +19851,8 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "contexts",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -20234,14 +19861,14 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->contexts (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -20254,8 +19881,8 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "contexts",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -20264,15 +19891,15 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->contexts (
-        contexts,
-        ACE_TRY_ENV
+        contexts
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -20287,8 +19914,8 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "exceptions",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -20297,14 +19924,14 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->exceptions (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -20317,8 +19944,8 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "exceptions",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -20327,8 +19954,8 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->exceptions (
-        exceptions,
-        ACE_TRY_ENV
+        exceptions
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -20358,8 +19985,8 @@ POA_CORBA_OperationDef::~POA_CORBA_OperationDef (void)
 void POA_CORBA_OperationDef::_get_result_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef *_tao_impl =
@@ -20379,19 +20006,19 @@ void POA_CORBA_OperationDef::_get_result_skel (
   TAO_ServerRequestInfo_CORBA_OperationDef_result_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->result (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -20400,20 +20027,20 @@ void POA_CORBA_OperationDef::_get_result_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -20435,16 +20062,13 @@ void POA_CORBA_OperationDef::_get_result_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_OperationDef::_get_result_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef *_tao_impl =
@@ -20464,19 +20088,19 @@ void POA_CORBA_OperationDef::_get_result_def_skel (
   TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->result_def (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -20485,20 +20109,20 @@ void POA_CORBA_OperationDef::_get_result_def_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -20520,16 +20144,13 @@ void POA_CORBA_OperationDef::_get_result_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_OperationDef::_set_result_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -20557,39 +20178,39 @@ void POA_CORBA_OperationDef::_set_result_def_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      result_def.in (),
-      ACE_TRY_ENV
+      result_def.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->result_def (
-          result_def.in (),
-          ACE_TRY_ENV
+          result_def.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -20604,16 +20225,13 @@ void POA_CORBA_OperationDef::_set_result_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_OperationDef::_get_params_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef *_tao_impl =
@@ -20633,19 +20251,19 @@ void POA_CORBA_OperationDef::_get_params_skel (
   TAO_ServerRequestInfo_CORBA_OperationDef_params_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->params (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -20654,20 +20272,20 @@ void POA_CORBA_OperationDef::_get_params_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -20689,16 +20307,13 @@ void POA_CORBA_OperationDef::_get_params_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_OperationDef::_set_params_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -20726,39 +20341,39 @@ void POA_CORBA_OperationDef::_set_params_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      params,
-      ACE_TRY_ENV
+      params
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->params (
-          params,
-          ACE_TRY_ENV
+          params
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -20773,16 +20388,13 @@ void POA_CORBA_OperationDef::_set_params_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_OperationDef::_get_mode_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef *_tao_impl =
@@ -20802,19 +20414,19 @@ void POA_CORBA_OperationDef::_get_mode_skel (
   TAO_ServerRequestInfo_CORBA_OperationDef_mode_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->mode (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -20822,20 +20434,20 @@ void POA_CORBA_OperationDef::_get_mode_skel (
       CORBA::OperationMode _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -20857,16 +20469,13 @@ void POA_CORBA_OperationDef::_get_mode_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_OperationDef::_set_mode_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -20894,39 +20503,39 @@ void POA_CORBA_OperationDef::_set_mode_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      mode,
-      ACE_TRY_ENV
+      mode
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->mode (
-          mode,
-          ACE_TRY_ENV
+          mode
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -20941,16 +20550,13 @@ void POA_CORBA_OperationDef::_set_mode_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_OperationDef::_get_contexts_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef *_tao_impl =
@@ -20970,19 +20576,19 @@ void POA_CORBA_OperationDef::_get_contexts_skel (
   TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->contexts (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -20991,20 +20597,20 @@ void POA_CORBA_OperationDef::_get_contexts_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -21026,16 +20632,13 @@ void POA_CORBA_OperationDef::_get_contexts_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_OperationDef::_set_contexts_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -21063,39 +20666,39 @@ void POA_CORBA_OperationDef::_set_contexts_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      contexts,
-      ACE_TRY_ENV
+      contexts
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->contexts (
-          contexts,
-          ACE_TRY_ENV
+          contexts
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -21110,16 +20713,13 @@ void POA_CORBA_OperationDef::_set_contexts_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_OperationDef::_get_exceptions_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef *_tao_impl =
@@ -21139,19 +20739,19 @@ void POA_CORBA_OperationDef::_get_exceptions_skel (
   TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->exceptions (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -21160,20 +20760,20 @@ void POA_CORBA_OperationDef::_get_exceptions_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -21195,16 +20795,13 @@ void POA_CORBA_OperationDef::_get_exceptions_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_OperationDef::_set_exceptions_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -21232,39 +20829,39 @@ void POA_CORBA_OperationDef::_set_exceptions_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      exceptions,
-      ACE_TRY_ENV
+      exceptions
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->exceptions (
-          exceptions,
-          ACE_TRY_ENV
+          exceptions
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -21279,16 +20876,13 @@ void POA_CORBA_OperationDef::_set_exceptions_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_OperationDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -21298,7 +20892,7 @@ void POA_CORBA_OperationDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -21310,12 +20904,12 @@ void POA_CORBA_OperationDef::_is_a_skel (
 void POA_CORBA_OperationDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef *_tao_impl = (POA_CORBA_OperationDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -21327,8 +20921,8 @@ void POA_CORBA_OperationDef::_non_existent_skel (
 void POA_CORBA_OperationDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef *_tao_impl = (POA_CORBA_OperationDef *) _tao_object_reference;
@@ -21347,7 +20941,7 @@ void POA_CORBA_OperationDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -21373,11 +20967,11 @@ void POA_CORBA_OperationDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_OperationDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -21405,12 +20999,12 @@ void* POA_CORBA_OperationDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_OperationDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_OperationDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -21420,9 +21014,9 @@ const char* POA_CORBA_OperationDef::_interface_repository_id (void) const
 }
 
 CORBA_OperationDef*
-POA_CORBA_OperationDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_OperationDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -21614,36 +21208,32 @@ public:
   TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_InterfaceDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_InterfaceDefSeq * result);
@@ -21660,45 +21250,45 @@ private:
 TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_InterfaceDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_InterfaceDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -21710,7 +21300,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (CORBA::Env
 
 char *
 TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -21719,11 +21309,11 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::target_most_derive
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -21740,36 +21330,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_InterfaceDef *tao_impl
     ,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -21787,8 +21373,8 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::TAO_ServerRequestI
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_InterfaceDef *tao_impl,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -21796,12 +21382,12 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::TAO_ServerRequestI
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -21817,25 +21403,25 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::arguments (CORBA::
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -21843,7 +21429,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::result (CORBA::Env
 
 char *
 TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -21852,11 +21438,11 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::target_most_derive
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a : public TAO_ServerRequestInfo
@@ -21866,36 +21452,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_InterfaceDef *tao_impl
     ,
-    const char * interface_id,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * interface_id
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -21914,8 +21496,8 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::TAO_ServerRequestInfo_CORBA_Inter
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_InterfaceDef *tao_impl,
-    const char * interface_id,
-    CORBA::Environment &
+    const char * interface_id
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -21923,12 +21505,12 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::TAO_ServerRequestInfo_CORBA_Inter
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -21944,25 +21526,25 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::arguments (CORBA::Environment &AC
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -21974,7 +21556,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::result (CORBA::Environment &ACE_T
 
 char *
 TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -21983,11 +21565,11 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -22003,36 +21585,32 @@ public:
   TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_InterfaceDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_InterfaceDef::FullInterfaceDescription * result);
@@ -22049,45 +21627,45 @@ private:
 TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_InterfaceDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_InterfaceDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -22099,7 +21677,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::result (CORBA::Envi
 
 char *
 TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -22108,11 +21686,11 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::target_most_derived
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -22133,36 +21711,32 @@ public:
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode & mode,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA::AttributeMode & mode
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_AttributeDef_ptr result);
@@ -22189,8 +21763,8 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::TAO_ServerRequestInfo
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode & mode,
-    CORBA::Environment &
+    CORBA::AttributeMode & mode
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -22202,12 +21776,12 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::TAO_ServerRequestInfo
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -22235,25 +21809,25 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::arguments (CORBA::Env
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -22265,7 +21839,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::result (CORBA::Enviro
 
 char *
 TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -22274,11 +21848,11 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::target_most_derived_i
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -22302,36 +21876,32 @@ public:
     CORBA::OperationMode & mode,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_OperationDef_ptr result);
@@ -22364,8 +21934,8 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::TAO_ServerRequestInfo
     CORBA::OperationMode & mode,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -22380,12 +21950,12 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::TAO_ServerRequestInfo
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -22422,25 +21992,25 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::arguments (CORBA::Env
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -22452,7 +22022,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::result (CORBA::Enviro
 
 char *
 TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -22461,11 +22031,11 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::target_most_derived_i
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -22504,18 +22074,18 @@ _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::~_TAO_CORBA_InterfaceDef_Strat
 
 _TAO_CORBA_InterfaceDef_Proxy_Impl&
 _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_InterfaceDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_InterfaceDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -22524,8 +22094,8 @@ _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -22594,8 +22164,8 @@ _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::_TAO_CORBA_InterfaceDef_ThruPOA_Prox
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -22610,8 +22180,8 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfa
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "base_interfaces",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -22620,14 +22190,14 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfa
           "IDL:omg.org/CORBA/InterfaceDef:1.0"
         )
     )->base_interfaces (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -22640,8 +22210,8 @@ void _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "base_interfaces",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -22650,16 +22220,16 @@ void _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
           "IDL:omg.org/CORBA/InterfaceDef:1.0"
         )
     )->base_interfaces (
-        base_interfaces,
-        ACE_TRY_ENV
+        base_interfaces
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::Boolean _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::is_a (
     CORBA_Object *_collocated_tao_target_,
-    const char * interface_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * interface_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -22674,8 +22244,8 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::is_a (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "is_a",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -22684,14 +22254,14 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::is_a (
           "IDL:omg.org/CORBA/InterfaceDef:1.0"
         )
     )->is_a (
-        interface_id,
-        ACE_TRY_ENV
+        interface_id
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::describe_interface (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -22706,8 +22276,8 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_ThruPOA_P
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "describe_interface",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -22716,7 +22286,7 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_ThruPOA_P
           "IDL:omg.org/CORBA/InterfaceDef:1.0"
         )
     )->describe_interface (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -22726,8 +22296,8 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_attrib
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::AttributeMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -22742,8 +22312,8 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_attrib
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_attribute",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -22756,8 +22326,8 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_attrib
         name,
         version,
         type,
-        mode,
-        ACE_TRY_ENV
+        mode
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -22770,8 +22340,8 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_operat
     CORBA::OperationMode mode,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -22786,8 +22356,8 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_operat
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_operation",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -22803,8 +22373,8 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_operat
         mode,
         params,
         exceptions,
-        contexts,
-        ACE_TRY_ENV
+        contexts
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -22835,8 +22405,8 @@ POA_CORBA_InterfaceDef::~POA_CORBA_InterfaceDef (void)
 void POA_CORBA_InterfaceDef::_get_base_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef *_tao_impl =
@@ -22856,19 +22426,19 @@ void POA_CORBA_InterfaceDef::_get_base_interfaces_skel (
   TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->base_interfaces (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -22877,20 +22447,20 @@ void POA_CORBA_InterfaceDef::_get_base_interfaces_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -22912,16 +22482,13 @@ void POA_CORBA_InterfaceDef::_get_base_interfaces_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_InterfaceDef::_set_base_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -22949,39 +22516,39 @@ void POA_CORBA_InterfaceDef::_set_base_interfaces_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      base_interfaces,
-      ACE_TRY_ENV
+      base_interfaces
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->base_interfaces (
-          base_interfaces,
-          ACE_TRY_ENV
+          base_interfaces
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -22996,16 +22563,13 @@ void POA_CORBA_InterfaceDef::_set_base_interfaces_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_InterfaceDef::is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -23033,20 +22597,20 @@ void POA_CORBA_InterfaceDef::is_a_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      interface_id.in (),
-      ACE_TRY_ENV
+      interface_id.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_a (
-          interface_id.in (),
-          ACE_TRY_ENV
+          interface_id.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -23054,20 +22618,20 @@ void POA_CORBA_InterfaceDef::is_a_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -23089,16 +22653,13 @@ void POA_CORBA_InterfaceDef::is_a_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_InterfaceDef::describe_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef *_tao_impl =
@@ -23118,19 +22679,19 @@ void POA_CORBA_InterfaceDef::describe_interface_skel (
   TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->describe_interface (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -23139,20 +22700,20 @@ void POA_CORBA_InterfaceDef::describe_interface_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -23174,16 +22735,13 @@ void POA_CORBA_InterfaceDef::describe_interface_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_InterfaceDef::create_attribute_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -23223,13 +22781,13 @@ void POA_CORBA_InterfaceDef::create_attribute_skel (
       name.in (),
       version.in (),
       type.in (),
-      mode,
-      ACE_TRY_ENV
+      mode
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -23239,8 +22797,8 @@ void POA_CORBA_InterfaceDef::create_attribute_skel (
           name.in (),
           version.in (),
           type.in (),
-          mode,
-          ACE_TRY_ENV
+          mode
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -23249,20 +22807,20 @@ void POA_CORBA_InterfaceDef::create_attribute_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -23284,16 +22842,13 @@ void POA_CORBA_InterfaceDef::create_attribute_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_InterfaceDef::create_operation_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -23342,13 +22897,13 @@ void POA_CORBA_InterfaceDef::create_operation_skel (
       mode,
       params,
       exceptions,
-      contexts,
-      ACE_TRY_ENV
+      contexts
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -23361,8 +22916,8 @@ void POA_CORBA_InterfaceDef::create_operation_skel (
           mode,
           params,
           exceptions,
-          contexts,
-          ACE_TRY_ENV
+          contexts
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -23371,20 +22926,20 @@ void POA_CORBA_InterfaceDef::create_operation_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -23406,16 +22961,13 @@ void POA_CORBA_InterfaceDef::create_operation_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_InterfaceDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -23425,7 +22977,7 @@ void POA_CORBA_InterfaceDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -23437,12 +22989,12 @@ void POA_CORBA_InterfaceDef::_is_a_skel (
 void POA_CORBA_InterfaceDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef *_tao_impl = (POA_CORBA_InterfaceDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -23454,8 +23006,8 @@ void POA_CORBA_InterfaceDef::_non_existent_skel (
 void POA_CORBA_InterfaceDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef *_tao_impl = (POA_CORBA_InterfaceDef *) _tao_object_reference;
@@ -23474,7 +23026,7 @@ void POA_CORBA_InterfaceDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -23500,11 +23052,11 @@ void POA_CORBA_InterfaceDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_InterfaceDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -23538,12 +23090,12 @@ void* POA_CORBA_InterfaceDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_InterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_InterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -23553,9 +23105,9 @@ const char* POA_CORBA_InterfaceDef::_interface_repository_id (void) const
 }
 
 CORBA_InterfaceDef*
-POA_CORBA_InterfaceDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_InterfaceDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -23770,18 +23322,18 @@ _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::~_TAO_CORBA_AbstractIn
 
 _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl&
 _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_AbstractInterfaceDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_AbstractInterfaceDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -23790,8 +23342,8 @@ _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -23887,8 +23439,8 @@ POA_CORBA_AbstractInterfaceDef::~POA_CORBA_AbstractInterfaceDef (void)
 void POA_CORBA_AbstractInterfaceDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -23898,7 +23450,7 @@ void POA_CORBA_AbstractInterfaceDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -23910,12 +23462,12 @@ void POA_CORBA_AbstractInterfaceDef::_is_a_skel (
 void POA_CORBA_AbstractInterfaceDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_AbstractInterfaceDef *_tao_impl = (POA_CORBA_AbstractInterfaceDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -23927,8 +23479,8 @@ void POA_CORBA_AbstractInterfaceDef::_non_existent_skel (
 void POA_CORBA_AbstractInterfaceDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_AbstractInterfaceDef *_tao_impl = (POA_CORBA_AbstractInterfaceDef *) _tao_object_reference;
@@ -23947,7 +23499,7 @@ void POA_CORBA_AbstractInterfaceDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -23973,11 +23525,11 @@ void POA_CORBA_AbstractInterfaceDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_AbstractInterfaceDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -24014,12 +23566,12 @@ void* POA_CORBA_AbstractInterfaceDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_AbstractInterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_AbstractInterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -24029,9 +23581,9 @@ const char* POA_CORBA_AbstractInterfaceDef::_interface_repository_id (void) cons
 }
 
 CORBA_AbstractInterfaceDef*
-POA_CORBA_AbstractInterfaceDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_AbstractInterfaceDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -24246,18 +23798,18 @@ _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::~_TAO_CORBA_LocalInterfac
 
 _TAO_CORBA_LocalInterfaceDef_Proxy_Impl&
 _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_LocalInterfaceDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_LocalInterfaceDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -24266,8 +23818,8 @@ _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -24363,8 +23915,8 @@ POA_CORBA_LocalInterfaceDef::~POA_CORBA_LocalInterfaceDef (void)
 void POA_CORBA_LocalInterfaceDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -24374,7 +23926,7 @@ void POA_CORBA_LocalInterfaceDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -24386,12 +23938,12 @@ void POA_CORBA_LocalInterfaceDef::_is_a_skel (
 void POA_CORBA_LocalInterfaceDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_LocalInterfaceDef *_tao_impl = (POA_CORBA_LocalInterfaceDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -24403,8 +23955,8 @@ void POA_CORBA_LocalInterfaceDef::_non_existent_skel (
 void POA_CORBA_LocalInterfaceDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_LocalInterfaceDef *_tao_impl = (POA_CORBA_LocalInterfaceDef *) _tao_object_reference;
@@ -24423,7 +23975,7 @@ void POA_CORBA_LocalInterfaceDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -24449,11 +24001,11 @@ void POA_CORBA_LocalInterfaceDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_LocalInterfaceDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -24490,12 +24042,12 @@ void* POA_CORBA_LocalInterfaceDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_LocalInterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_LocalInterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -24505,9 +24057,9 @@ const char* POA_CORBA_LocalInterfaceDef::_interface_repository_id (void) const
 }
 
 CORBA_LocalInterfaceDef*
-POA_CORBA_LocalInterfaceDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_LocalInterfaceDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS.h b/TAO/orbsvcs/IFR_Service/IFR_BasicS.h
index fc3af925d03..5b95644bc38 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BasicS.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS.h
@@ -64,10 +64,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -76,338 +75,310 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_Repository *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA_Contained_ptr lookup_id (
-      const char * search_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * search_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void lookup_id_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA::TypeCode_ptr get_canonical_typecode (
-      CORBA::TypeCode_ptr tc,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::TypeCode_ptr tc
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void get_canonical_typecode_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_PrimitiveDef_ptr get_primitive (
-      CORBA::PrimitiveKind kind,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::PrimitiveKind kind
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void get_primitive_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_StringDef_ptr create_string (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_string_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_WstringDef_ptr create_wstring (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_wstring_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_SequenceDef_ptr create_sequence (
       CORBA::ULong bound,
-      CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_sequence_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ArrayDef_ptr create_array (
       CORBA::ULong length,
-      CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_array_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_FixedDef_ptr create_fixed (
       CORBA::UShort digits,
-      CORBA::Short scale,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Short scale
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_fixed_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void lookup_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void lookup_name_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_module_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_constant_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_struct_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_union_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_enum_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_alias_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_box_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_exception_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_native_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_abstract_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_local_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_Repository_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_Repository_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_Repository_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_Repository_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_Repository_Proxy_Impl &select_proxy (
-    ::CORBA_Repository *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_Repository *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -415,18 +386,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_Repository_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -438,7 +409,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -446,93 +417,93 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_Repository_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_Repository_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_Repository_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_Repository_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_Repository_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA_Contained_ptr lookup_id (
       CORBA_Object *_collocated_tao_target_,
-      const char * search_id,
-      CORBA::Environment &ACE_TRY_ENV
+      const char * search_id
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA::TypeCode_ptr get_canonical_typecode (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::TypeCode_ptr tc,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::TypeCode_ptr tc
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_PrimitiveDef_ptr get_primitive (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::PrimitiveKind kind,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::PrimitiveKind kind
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_StringDef_ptr create_string (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_WstringDef_ptr create_wstring (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_SequenceDef_ptr create_sequence (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound,
-      CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_IDLType_ptr element_type
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ArrayDef_ptr create_array (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong length,
-      CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_IDLType_ptr element_type
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_FixedDef_ptr create_fixed (
       CORBA_Object *_collocated_tao_target_,
       CORBA::UShort digits,
-      CORBA::Short scale,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Short scale
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -557,10 +528,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -569,295 +539,264 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_ModuleDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   static void lookup_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void lookup_name_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_module_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_constant_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_struct_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_union_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_enum_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_alias_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_box_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_exception_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_native_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_abstract_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_local_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ModuleDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_ModuleDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_ModuleDef_Proxy_Impl &select_proxy (
-    ::CORBA_ModuleDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_ModuleDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -865,18 +804,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_ModuleDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -888,7 +827,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -896,18 +835,18 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_ModuleDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_ModuleDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_ModuleDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl, 
+  public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl,
   public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_ModuleDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_ModuleDef_ThruPOA_Proxy_Impl (void) { }
-  
+
 };
 
 
@@ -932,10 +871,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -944,236 +882,217 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_ConstantDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_type_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_IDLType_ptr type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void type_def (
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA::Any * value (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_value_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void value (
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_value_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ConstantDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_ConstantDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_ConstantDef_Proxy_Impl &select_proxy (
-    ::CORBA_ConstantDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_ConstantDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -1181,18 +1100,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_ConstantDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -1204,7 +1123,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -1212,60 +1131,60 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_ConstantDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::TypeCode_ptr type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_IDLType_ptr type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_IDLType_ptr type_def
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA::Any * value (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void value (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -1290,10 +1209,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -1302,334 +1220,300 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_StructDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA_StructMemberSeq * members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_members_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void members (
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_members_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void lookup_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void lookup_name_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_module_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_constant_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_struct_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_union_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_enum_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_alias_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_box_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_exception_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_native_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_abstract_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_local_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_StructDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_StructDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_StructDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_StructDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_StructDef_Proxy_Impl &select_proxy (
-    ::CORBA_StructDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_StructDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -1637,18 +1521,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_StructDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -1660,7 +1544,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -1668,36 +1552,36 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_StructDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl, 
+  public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl,
   public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_StructDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA_StructMemberSeq * members (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void members (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -1722,10 +1606,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -1734,380 +1617,343 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_UnionDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::TypeCode_ptr discriminator_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_discriminator_type_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_IDLType_ptr discriminator_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_discriminator_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void discriminator_type_def (
-      CORBA_IDLType_ptr discriminator_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr discriminator_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_discriminator_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_UnionMemberSeq * members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_members_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void members (
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_members_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void lookup_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void lookup_name_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_module_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_constant_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_struct_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_union_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_enum_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_alias_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_box_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_exception_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_native_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_abstract_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_local_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_UnionDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_UnionDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_UnionDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_UnionDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_UnionDef_Proxy_Impl &select_proxy (
-    ::CORBA_UnionDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_UnionDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -2115,18 +1961,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_UnionDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -2138,7 +1984,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -2146,61 +1992,61 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_UnionDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl, 
+  public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl,
   public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::TypeCode_ptr discriminator_type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_IDLType_ptr discriminator_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void discriminator_type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr discriminator_type_def,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_IDLType_ptr discriminator_type_def
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_UnionMemberSeq * members (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void members (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -2225,10 +2071,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -2237,198 +2082,181 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_EnumDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA_EnumMemberSeq * members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_members_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void members (
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_members_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_EnumDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_EnumDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_EnumDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_EnumDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_EnumDef_Proxy_Impl &select_proxy (
-    ::CORBA_EnumDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_EnumDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -2436,18 +2264,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_EnumDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -2459,7 +2287,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -2467,35 +2295,35 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_EnumDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA_EnumMemberSeq * members (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void members (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -2520,10 +2348,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -2532,198 +2359,181 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_AliasDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA_IDLType_ptr original_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_original_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void original_type_def (
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_original_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_AliasDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_AliasDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_AliasDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_AliasDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_AliasDef_Proxy_Impl &select_proxy (
-    ::CORBA_AliasDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_AliasDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -2731,18 +2541,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_AliasDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -2754,7 +2564,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -2762,35 +2572,35 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_AliasDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA_IDLType_ptr original_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void original_type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -2815,10 +2625,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -2827,167 +2636,152 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_NativeDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_NativeDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_NativeDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_NativeDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_NativeDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_NativeDef_Proxy_Impl &select_proxy (
-    ::CORBA_NativeDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_NativeDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -2995,18 +2789,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_NativeDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -3018,7 +2812,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -3026,17 +2820,17 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_NativeDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_NativeDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_NativeDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_NativeDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_NativeDef_ThruPOA_Proxy_Impl (void) { }
-  
+
 };
 
 
@@ -3061,10 +2855,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -3073,94 +2866,89 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_PrimitiveDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::PrimitiveKind kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_kind_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_PrimitiveDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_PrimitiveDef_Proxy_Impl &select_proxy (
-    ::CORBA_PrimitiveDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_PrimitiveDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -3168,18 +2956,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_PrimitiveDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -3191,7 +2979,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -3199,26 +2987,26 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_PrimitiveDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::PrimitiveKind kind (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -3243,10 +3031,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -3255,110 +3042,104 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_StringDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::ULong bound (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_bound_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void bound (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_bound_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_StringDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_StringDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_StringDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_StringDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_StringDef_Proxy_Impl &select_proxy (
-    ::CORBA_StringDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_StringDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -3366,18 +3147,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_StringDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -3389,7 +3170,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -3397,35 +3178,35 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_StringDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_StringDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::ULong bound (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void bound (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -3450,10 +3231,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -3462,110 +3242,104 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_WstringDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::ULong bound (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_bound_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void bound (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_bound_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_WstringDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_WstringDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_WstringDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_WstringDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_WstringDef_Proxy_Impl &select_proxy (
-    ::CORBA_WstringDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_WstringDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -3573,18 +3347,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_WstringDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -3596,7 +3370,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -3604,35 +3378,35 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_WstringDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::ULong bound (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void bound (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -3657,10 +3431,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -3669,156 +3442,147 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_SequenceDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::ULong bound (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_bound_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void bound (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_bound_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA::TypeCode_ptr element_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_element_type_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_IDLType_ptr element_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_element_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void element_type_def (
-      CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_element_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_SequenceDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_SequenceDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_SequenceDef_Proxy_Impl &select_proxy (
-    ::CORBA_SequenceDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_SequenceDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -3826,18 +3590,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_SequenceDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -3849,7 +3613,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -3857,60 +3621,60 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_SequenceDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::ULong bound (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void bound (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA::TypeCode_ptr element_type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_IDLType_ptr element_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void element_type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_IDLType_ptr element_type_def
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -3935,10 +3699,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -3947,156 +3710,147 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_ArrayDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::ULong length (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_length_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void length (
-      CORBA::ULong length,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong length
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_length_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA::TypeCode_ptr element_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_element_type_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_IDLType_ptr element_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_element_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void element_type_def (
-      CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_element_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ArrayDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_ArrayDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_ArrayDef_Proxy_Impl &select_proxy (
-    ::CORBA_ArrayDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_ArrayDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -4104,18 +3858,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_ArrayDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -4127,7 +3881,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -4135,60 +3889,60 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_ArrayDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::ULong length (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void length (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::ULong length,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::ULong length
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA::TypeCode_ptr element_type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_IDLType_ptr element_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void element_type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_IDLType_ptr element_type_def
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -4213,10 +3967,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -4225,341 +3978,307 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_ExceptionDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_type_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_StructMemberSeq * members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_members_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void members (
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_members_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void lookup_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void lookup_name_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_module_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_constant_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_struct_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_union_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_enum_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_alias_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_box_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_exception_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_native_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_abstract_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_local_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ExceptionDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_ExceptionDef_Proxy_Impl &select_proxy (
-    ::CORBA_ExceptionDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_ExceptionDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -4567,18 +4286,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_ExceptionDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -4590,7 +4309,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -4598,44 +4317,44 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_ExceptionDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl, 
+  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl,
   public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::TypeCode_ptr type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_StructMemberSeq * members (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void members (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -4660,10 +4379,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -4672,236 +4390,217 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_AttributeDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_type_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_IDLType_ptr type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void type_def (
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA::AttributeMode mode (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_mode_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void mode (
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_mode_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_AttributeDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_AttributeDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_AttributeDef_Proxy_Impl &select_proxy (
-    ::CORBA_AttributeDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_AttributeDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -4909,18 +4608,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_AttributeDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -4932,7 +4631,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -4940,60 +4639,60 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_AttributeDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::TypeCode_ptr type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_IDLType_ptr type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_IDLType_ptr type_def
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA::AttributeMode mode (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void mode (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -5018,10 +4717,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -5030,329 +4728,304 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_OperationDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::TypeCode_ptr result (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_result_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_IDLType_ptr result_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_result_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void result_def (
-      CORBA_IDLType_ptr result_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr result_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_result_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ParDescriptionSeq * params (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_params_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void params (
-      const CORBA_ParDescriptionSeq & params,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ParDescriptionSeq & params
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_params_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA::OperationMode mode (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_mode_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void mode (
-      CORBA::OperationMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::OperationMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_mode_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ContextIdSeq * contexts (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_contexts_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void contexts (
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ContextIdSeq & contexts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_contexts_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ExceptionDefSeq * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_exceptions_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void exceptions (
-      const CORBA_ExceptionDefSeq & exceptions,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ExceptionDefSeq & exceptions
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_exceptions_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_OperationDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_OperationDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_OperationDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_OperationDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_OperationDef_Proxy_Impl &select_proxy (
-    ::CORBA_OperationDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_OperationDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -5360,18 +5033,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_OperationDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -5383,7 +5056,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -5391,111 +5064,111 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_OperationDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::TypeCode_ptr result (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_IDLType_ptr result_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void result_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr result_def,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_IDLType_ptr result_def
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ParDescriptionSeq * params (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void params (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA_ParDescriptionSeq & params,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_ParDescriptionSeq & params
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA::OperationMode mode (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void mode (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::OperationMode mode,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::OperationMode mode
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ContextIdSeq * contexts (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void contexts (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_ContextIdSeq & contexts
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ExceptionDefSeq * exceptions (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void exceptions (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA_ExceptionDefSeq & exceptions,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_ExceptionDefSeq & exceptions
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -5520,10 +5193,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -5532,97 +5204,92 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_InterfaceDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA_InterfaceDefSeq * base_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_base_interfaces_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void base_interfaces (
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_base_interfaces_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA::Boolean is_a (
-      const char * interface_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * interface_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void is_a_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void describe_interface_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_AttributeDef_ptr create_attribute (
@@ -5630,19 +5297,18 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_attribute_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_OperationDef_ptr create_operation (
@@ -5653,287 +5319,255 @@ public:
       CORBA::OperationMode mode,
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ContextIdSeq & contexts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_operation_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void lookup_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void lookup_name_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_module_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_constant_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_struct_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_union_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_enum_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_alias_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_box_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_exception_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_native_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_abstract_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_local_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_InterfaceDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_InterfaceDef_Proxy_Impl &select_proxy (
-    ::CORBA_InterfaceDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_InterfaceDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -5941,18 +5575,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_InterfaceDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -5964,7 +5598,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -5972,66 +5606,66 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_InterfaceDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl, 
-  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl, 
+  public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl,
+  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl,
   public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA_InterfaceDefSeq * base_interfaces (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void base_interfaces (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA::Boolean is_a (
       CORBA_Object *_collocated_tao_target_,
-      const char * interface_id,
-      CORBA::Environment &ACE_TRY_ENV
+      const char * interface_id
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_AttributeDef_ptr create_attribute (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_OperationDef_ptr create_operation (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
@@ -6041,14 +5675,14 @@ public:
       CORBA::OperationMode mode,
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_ContextIdSeq & contexts
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -6073,10 +5707,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -6085,351 +5718,313 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_AbstractInterfaceDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   static void _get_base_interfaces_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_base_interfaces_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void is_a_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_attribute_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_operation_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void lookup_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void lookup_name_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_module_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_constant_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_struct_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_union_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_enum_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_alias_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_box_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_exception_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_native_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_abstract_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_local_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_AbstractInterfaceDef_Proxy_Impl &select_proxy (
-    ::CORBA_AbstractInterfaceDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_AbstractInterfaceDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -6437,18 +6032,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_AbstractInterfaceDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -6460,7 +6055,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -6468,17 +6063,17 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_AbstractInterfaceDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_AbstractInterfaceDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_AbstractInterfaceDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_AbstractInterfaceDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_AbstractInterfaceDef_ThruPOA_Proxy_Impl (void) { }
-  
+
 };
 
 
@@ -6503,10 +6098,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -6515,351 +6109,313 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_LocalInterfaceDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   static void _get_base_interfaces_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_base_interfaces_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void is_a_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_attribute_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_operation_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void lookup_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void lookup_name_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_module_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_constant_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_struct_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_union_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_enum_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_alias_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_box_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_exception_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_native_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_abstract_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_local_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_LocalInterfaceDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_LocalInterfaceDef_Proxy_Impl &select_proxy (
-    ::CORBA_LocalInterfaceDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_LocalInterfaceDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -6867,18 +6423,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_LocalInterfaceDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -6890,7 +6446,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -6898,17 +6454,17 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_LocalInterfaceDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_LocalInterfaceDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_LocalInterfaceDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_LocalInterfaceDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_LocalInterfaceDef_ThruPOA_Proxy_Impl (void) { }
-  
+
 };
 
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS.i b/TAO/orbsvcs/IFR_Service/IFR_BasicS.i
index 9444278bdea..452b604e36f 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BasicS.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS.i
@@ -22,5130 +22,5130 @@
 ACE_INLINE void POA_CORBA_Repository::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_PrimitiveDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_PrimitiveDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_PrimitiveDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_PrimitiveDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_PrimitiveDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_PrimitiveDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StringDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_StringDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StringDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_StringDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StringDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_StringDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_WstringDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_WstringDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_WstringDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_WstringDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_WstringDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_WstringDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_SequenceDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_SequenceDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_SequenceDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_SequenceDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_SequenceDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_SequenceDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ArrayDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_ArrayDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ArrayDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ArrayDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ArrayDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ArrayDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_base_interfaces_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_InterfaceDef::_get_base_interfaces_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_base_interfaces_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_InterfaceDef::_set_base_interfaces_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::is_a_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_InterfaceDef::is_a_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::describe_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_InterfaceDef::describe_interface_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_attribute_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_InterfaceDef::create_attribute_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_operation_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_InterfaceDef::create_operation_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_base_interfaces_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_InterfaceDef::_get_base_interfaces_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_base_interfaces_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_InterfaceDef::_set_base_interfaces_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::is_a_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_InterfaceDef::is_a_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::describe_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_InterfaceDef::describe_interface_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_attribute_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_InterfaceDef::create_attribute_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_operation_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_InterfaceDef::create_operation_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h
index 8beacb70c71..84a6f1f22d9 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h
@@ -52,7 +52,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_Repository_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -64,214 +64,194 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA_Contained_ptr lookup_id (
-      const char * search_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * search_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr get_canonical_typecode (
-      CORBA::TypeCode_ptr tc,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::TypeCode_ptr tc
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_PrimitiveDef_ptr get_primitive (
-      CORBA::PrimitiveKind kind,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::PrimitiveKind kind
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_StringDef_ptr create_string (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_WstringDef_ptr create_wstring (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_SequenceDef_ptr create_sequence (
       CORBA::ULong bound,
-      CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ArrayDef_ptr create_array (
       CORBA::ULong length,
-      CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_FixedDef_ptr create_fixed (
       CORBA::UShort digits,
-      CORBA::Short scale,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Short scale
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * search_name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Long max_returned_objs
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueDef_ptr create_value (
       const char * id,
       const char * name,
@@ -282,94 +262,86 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_Repository_tie (const POA_CORBA_Repository_tie &);
   void operator= (const POA_CORBA_Repository_tie &);
@@ -390,7 +362,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_ModuleDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -402,139 +374,127 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * search_name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Long max_returned_objs
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueDef_ptr create_value (
       const char * id,
       const char * name,
@@ -545,188 +505,169 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_ModuleDef_tie (const POA_CORBA_ModuleDef_tie &);
   void operator= (const POA_CORBA_ModuleDef_tie &);
@@ -747,7 +688,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_ConstantDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -759,169 +700,150 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_IDLType_ptr type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void type_def (
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::Any * value (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void value (
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_ConstantDef_tie (const POA_CORBA_ConstantDef_tie &);
   void operator= (const POA_CORBA_ConstantDef_tie &);
@@ -942,7 +864,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_StructDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -954,156 +876,142 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA_StructMemberSeq * members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void members (
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * search_name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Long max_returned_objs
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueDef_ptr create_value (
       const char * id,
       const char * name,
@@ -1114,196 +1022,176 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_StructDef_tie (const POA_CORBA_StructDef_tie &);
   void operator= (const POA_CORBA_StructDef_tie &);
@@ -1324,7 +1212,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_UnionDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -1336,181 +1224,164 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::TypeCode_ptr discriminator_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_IDLType_ptr discriminator_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void discriminator_type_def (
-      CORBA_IDLType_ptr discriminator_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr discriminator_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_UnionMemberSeq * members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void members (
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * search_name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Long max_returned_objs
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueDef_ptr create_value (
       const char * id,
       const char * name,
@@ -1521,196 +1392,176 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_UnionDef_tie (const POA_CORBA_UnionDef_tie &);
   void operator= (const POA_CORBA_UnionDef_tie &);
@@ -1731,7 +1582,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_EnumDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -1743,152 +1594,135 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA_EnumMemberSeq * members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void members (
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_EnumDef_tie (const POA_CORBA_EnumDef_tie &);
   void operator= (const POA_CORBA_EnumDef_tie &);
@@ -1909,7 +1743,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_AliasDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -1921,152 +1755,135 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA_IDLType_ptr original_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void original_type_def (
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_AliasDef_tie (const POA_CORBA_AliasDef_tie &);
   void operator= (const POA_CORBA_AliasDef_tie &);
@@ -2087,7 +1904,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_NativeDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -2099,135 +1916,120 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_NativeDef_tie (const POA_CORBA_NativeDef_tie &);
   void operator= (const POA_CORBA_NativeDef_tie &);
@@ -2248,7 +2050,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_PrimitiveDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -2260,49 +2062,44 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::PrimitiveKind kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_PrimitiveDef_tie (const POA_CORBA_PrimitiveDef_tie &);
   void operator= (const POA_CORBA_PrimitiveDef_tie &);
@@ -2323,7 +2120,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_StringDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -2335,58 +2132,52 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::ULong bound (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void bound (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_StringDef_tie (const POA_CORBA_StringDef_tie &);
   void operator= (const POA_CORBA_StringDef_tie &);
@@ -2407,7 +2198,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_WstringDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -2419,58 +2210,52 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::ULong bound (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void bound (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_WstringDef_tie (const POA_CORBA_WstringDef_tie &);
   void operator= (const POA_CORBA_WstringDef_tie &);
@@ -2491,7 +2276,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_SequenceDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -2503,83 +2288,74 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::ULong bound (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void bound (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr element_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_IDLType_ptr element_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void element_type_def (
-      CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_SequenceDef_tie (const POA_CORBA_SequenceDef_tie &);
   void operator= (const POA_CORBA_SequenceDef_tie &);
@@ -2600,7 +2376,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_ArrayDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -2612,83 +2388,74 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::ULong length (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void length (
-      CORBA::ULong length,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong length
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr element_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_IDLType_ptr element_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void element_type_def (
-      CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_ArrayDef_tie (const POA_CORBA_ArrayDef_tie &);
   void operator= (const POA_CORBA_ArrayDef_tie &);
@@ -2709,7 +2476,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_ExceptionDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -2721,258 +2488,232 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_StructMemberSeq * members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void members (
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * search_name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Long max_returned_objs
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueDef_ptr create_value (
       const char * id,
       const char * name,
@@ -2983,94 +2724,86 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_ExceptionDef_tie (const POA_CORBA_ExceptionDef_tie &);
   void operator= (const POA_CORBA_ExceptionDef_tie &);
@@ -3091,7 +2824,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_AttributeDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -3103,169 +2836,150 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_IDLType_ptr type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void type_def (
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::AttributeMode mode (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void mode (
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_AttributeDef_tie (const POA_CORBA_AttributeDef_tie &);
   void operator= (const POA_CORBA_AttributeDef_tie &);
@@ -3286,7 +3000,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_OperationDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -3298,220 +3012,195 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::TypeCode_ptr result (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_IDLType_ptr result_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void result_def (
-      CORBA_IDLType_ptr result_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr result_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ParDescriptionSeq * params (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void params (
-      const CORBA_ParDescriptionSeq & params,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ParDescriptionSeq & params
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::OperationMode mode (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void mode (
-      CORBA::OperationMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::OperationMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContextIdSeq * contexts (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void contexts (
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ContextIdSeq & contexts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ExceptionDefSeq * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void exceptions (
-      const CORBA_ExceptionDefSeq & exceptions,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ExceptionDefSeq & exceptions
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_OperationDef_tie (const POA_CORBA_OperationDef_tie &);
   void operator= (const POA_CORBA_OperationDef_tie &);
@@ -3532,7 +3221,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_InterfaceDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -3544,59 +3233,53 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA_InterfaceDefSeq * base_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void base_interfaces (
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::Boolean is_a (
-      const char * interface_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * interface_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AttributeDef_ptr create_attribute (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_OperationDef_ptr create_operation (
       const char * id,
       const char * name,
@@ -3605,141 +3288,129 @@ public:
       CORBA::OperationMode mode,
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ContextIdSeq & contexts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * search_name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Long max_returned_objs
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueDef_ptr create_value (
       const char * id,
       const char * name,
@@ -3750,196 +3421,176 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_InterfaceDef_tie (const POA_CORBA_InterfaceDef_tie &);
   void operator= (const POA_CORBA_InterfaceDef_tie &);
@@ -3960,7 +3611,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_AbstractInterfaceDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -3972,59 +3623,53 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA_InterfaceDefSeq * base_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void base_interfaces (
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::Boolean is_a (
-      const char * interface_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * interface_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AttributeDef_ptr create_attribute (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_OperationDef_ptr create_operation (
       const char * id,
       const char * name,
@@ -4033,141 +3678,129 @@ public:
       CORBA::OperationMode mode,
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ContextIdSeq & contexts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * search_name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Long max_returned_objs
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueDef_ptr create_value (
       const char * id,
       const char * name,
@@ -4178,196 +3811,176 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_AbstractInterfaceDef_tie (const POA_CORBA_AbstractInterfaceDef_tie &);
   void operator= (const POA_CORBA_AbstractInterfaceDef_tie &);
@@ -4388,7 +4001,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_LocalInterfaceDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -4400,59 +4013,53 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA_InterfaceDefSeq * base_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void base_interfaces (
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::Boolean is_a (
-      const char * interface_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * interface_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AttributeDef_ptr create_attribute (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_OperationDef_ptr create_operation (
       const char * id,
       const char * name,
@@ -4461,141 +4068,129 @@ public:
       CORBA::OperationMode mode,
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ContextIdSeq & contexts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * search_name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Long max_returned_objs
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueDef_ptr create_value (
       const char * id,
       const char * name,
@@ -4606,196 +4201,176 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_LocalInterfaceDef_tie (const POA_CORBA_LocalInterfaceDef_tie &);
   void operator= (const POA_CORBA_LocalInterfaceDef_tie &);
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i
index 9cb8f3e6fff..ca9953d37d4 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i
@@ -23,30 +23,30 @@
 
 template <class T> ACE_INLINE
 POA_CORBA_Repository_tie<T>::POA_CORBA_Repository_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_Repository_tie<T>::POA_CORBA_Repository_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_Repository_tie<T>::POA_CORBA_Repository_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_Repository_tie<T>::POA_CORBA_Repository_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -90,94 +90,94 @@ POA_CORBA_Repository_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_Repository_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_Repository_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_Repository::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_Repository::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_Repository_tie<T>::lookup_id  (
-    const char * search_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup_id (
-search_id,
-    ACE_TRY_ENV
+search_id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_Repository_tie<T>::get_canonical_typecode  (
-    CORBA::TypeCode_ptr tc,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::TypeCode_ptr tc
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->get_canonical_typecode (
-tc,
-    ACE_TRY_ENV
+tc
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_PrimitiveDef_ptr POA_CORBA_Repository_tie<T>::get_primitive  (
-    CORBA::PrimitiveKind kind,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::PrimitiveKind kind
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->get_primitive (
-kind,
-    ACE_TRY_ENV
+kind
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_StringDef_ptr POA_CORBA_Repository_tie<T>::create_string  (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->create_string (
-bound,
-    ACE_TRY_ENV
+bound
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_WstringDef_ptr POA_CORBA_Repository_tie<T>::create_wstring  (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->create_wstring (
-bound,
-    ACE_TRY_ENV
+bound
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_SequenceDef_ptr POA_CORBA_Repository_tie<T>::create_sequence  (
     CORBA::ULong bound,
-    CORBA_IDLType_ptr element_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr element_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -185,16 +185,16 @@ CORBA_SequenceDef_ptr POA_CORBA_Repository_tie<T>::create_sequence  (
 {
   return this->ptr_->create_sequence (
 bound,
-    element_type,
-    ACE_TRY_ENV
+    element_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ArrayDef_ptr POA_CORBA_Repository_tie<T>::create_array  (
     CORBA::ULong length,
-    CORBA_IDLType_ptr element_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr element_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -202,16 +202,16 @@ CORBA_ArrayDef_ptr POA_CORBA_Repository_tie<T>::create_array  (
 {
   return this->ptr_->create_array (
 length,
-    element_type,
-    ACE_TRY_ENV
+    element_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_FixedDef_ptr POA_CORBA_Repository_tie<T>::create_fixed  (
     CORBA::UShort digits,
-    CORBA::Short scale,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Short scale
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -219,31 +219,31 @@ CORBA_FixedDef_ptr POA_CORBA_Repository_tie<T>::create_fixed  (
 {
   return this->ptr_->create_fixed (
 digits,
-    scale,
-    ACE_TRY_ENV
+    scale
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_Repository_tie<T>::lookup  (
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup (
-search_name,
-    ACE_TRY_ENV
+search_name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_Repository_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -251,8 +251,8 @@ CORBA_ContainedSeq * POA_CORBA_Repository_tie<T>::contents  (
 {
   return this->ptr_->contents (
 limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -261,8 +261,8 @@ CORBA_ContainedSeq * POA_CORBA_Repository_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -272,8 +272,8 @@ CORBA_ContainedSeq * POA_CORBA_Repository_tie<T>::lookup_name  (
 search_name,
     levels_to_search,
     limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -281,8 +281,8 @@ template <class T> ACE_INLINE
 CORBA_Container::DescriptionSeq * POA_CORBA_Repository_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Long max_returned_objs
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -291,8 +291,8 @@ CORBA_Container::DescriptionSeq * POA_CORBA_Repository_tie<T>::describe_contents
   return this->ptr_->describe_contents (
 limit_type,
     exclude_inherited,
-    max_returned_objs,
-    ACE_TRY_ENV
+    max_returned_objs
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -300,8 +300,8 @@ template <class T> ACE_INLINE
 CORBA_ModuleDef_ptr POA_CORBA_Repository_tie<T>::create_module  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -310,8 +310,8 @@ CORBA_ModuleDef_ptr POA_CORBA_Repository_tie<T>::create_module  (
   return this->ptr_->create_module (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -321,8 +321,8 @@ CORBA_ConstantDef_ptr POA_CORBA_Repository_tie<T>::create_constant  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -333,8 +333,8 @@ id,
     name,
     version,
     type,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -343,8 +343,8 @@ CORBA_StructDef_ptr POA_CORBA_Repository_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -354,8 +354,8 @@ CORBA_StructDef_ptr POA_CORBA_Repository_tie<T>::create_struct  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -365,8 +365,8 @@ CORBA_UnionDef_ptr POA_CORBA_Repository_tie<T>::create_union  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -377,8 +377,8 @@ id,
     name,
     version,
     discriminator_type,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -387,8 +387,8 @@ CORBA_EnumDef_ptr POA_CORBA_Repository_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -398,8 +398,8 @@ CORBA_EnumDef_ptr POA_CORBA_Repository_tie<T>::create_enum  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -408,8 +408,8 @@ CORBA_AliasDef_ptr POA_CORBA_Repository_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -419,8 +419,8 @@ CORBA_AliasDef_ptr POA_CORBA_Repository_tie<T>::create_alias  (
 id,
     name,
     version,
-    original_type,
-    ACE_TRY_ENV
+    original_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -429,8 +429,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_Repository_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -440,8 +440,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_Repository_tie<T>::create_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -456,8 +456,8 @@ CORBA_ValueDef_ptr POA_CORBA_Repository_tie<T>::create_value  (
     CORBA::Boolean is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -473,8 +473,8 @@ id,
     is_truncatable,
     abstract_base_values,
     supported_interfaces,
-    initializers,
-    ACE_TRY_ENV
+    initializers
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -483,8 +483,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_Repository_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -494,8 +494,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_Repository_tie<T>::create_value_box  (
 id,
     name,
     version,
-    original_type_def,
-    ACE_TRY_ENV
+    original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -504,8 +504,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_Repository_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -515,8 +515,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_Repository_tie<T>::create_exception  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -524,8 +524,8 @@ template <class T> ACE_INLINE
 CORBA_NativeDef_ptr POA_CORBA_Repository_tie<T>::create_native  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -534,8 +534,8 @@ CORBA_NativeDef_ptr POA_CORBA_Repository_tie<T>::create_native  (
   return this->ptr_->create_native (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -544,8 +544,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_Repository_tie<T>::create_abstract_inte
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -555,8 +555,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_Repository_tie<T>::create_abstract_inte
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -565,8 +565,8 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_Repository_tie<T>::create_local_interface
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -576,63 +576,63 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_Repository_tie<T>::create_local_interface
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_Repository_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_Repository_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_ModuleDef_tie<T>::POA_CORBA_ModuleDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ModuleDef_tie<T>::POA_CORBA_ModuleDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ModuleDef_tie<T>::POA_CORBA_ModuleDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ModuleDef_tie<T>::POA_CORBA_ModuleDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -676,34 +676,34 @@ POA_CORBA_ModuleDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_ModuleDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_ModuleDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_ModuleDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_ModuleDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_ModuleDef_tie<T>::lookup  (
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup (
-search_name,
-    ACE_TRY_ENV
+search_name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_ModuleDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -711,8 +711,8 @@ CORBA_ContainedSeq * POA_CORBA_ModuleDef_tie<T>::contents  (
 {
   return this->ptr_->contents (
 limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -721,8 +721,8 @@ CORBA_ContainedSeq * POA_CORBA_ModuleDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -732,8 +732,8 @@ CORBA_ContainedSeq * POA_CORBA_ModuleDef_tie<T>::lookup_name  (
 search_name,
     levels_to_search,
     limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -741,8 +741,8 @@ template <class T> ACE_INLINE
 CORBA_Container::DescriptionSeq * POA_CORBA_ModuleDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Long max_returned_objs
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -751,8 +751,8 @@ CORBA_Container::DescriptionSeq * POA_CORBA_ModuleDef_tie<T>::describe_contents
   return this->ptr_->describe_contents (
 limit_type,
     exclude_inherited,
-    max_returned_objs,
-    ACE_TRY_ENV
+    max_returned_objs
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -760,8 +760,8 @@ template <class T> ACE_INLINE
 CORBA_ModuleDef_ptr POA_CORBA_ModuleDef_tie<T>::create_module  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -770,8 +770,8 @@ CORBA_ModuleDef_ptr POA_CORBA_ModuleDef_tie<T>::create_module  (
   return this->ptr_->create_module (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -781,8 +781,8 @@ CORBA_ConstantDef_ptr POA_CORBA_ModuleDef_tie<T>::create_constant  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -793,8 +793,8 @@ id,
     name,
     version,
     type,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -803,8 +803,8 @@ CORBA_StructDef_ptr POA_CORBA_ModuleDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -814,8 +814,8 @@ CORBA_StructDef_ptr POA_CORBA_ModuleDef_tie<T>::create_struct  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -825,8 +825,8 @@ CORBA_UnionDef_ptr POA_CORBA_ModuleDef_tie<T>::create_union  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -837,8 +837,8 @@ id,
     name,
     version,
     discriminator_type,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -847,8 +847,8 @@ CORBA_EnumDef_ptr POA_CORBA_ModuleDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -858,8 +858,8 @@ CORBA_EnumDef_ptr POA_CORBA_ModuleDef_tie<T>::create_enum  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -868,8 +868,8 @@ CORBA_AliasDef_ptr POA_CORBA_ModuleDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -879,8 +879,8 @@ CORBA_AliasDef_ptr POA_CORBA_ModuleDef_tie<T>::create_alias  (
 id,
     name,
     version,
-    original_type,
-    ACE_TRY_ENV
+    original_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -889,8 +889,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_ModuleDef_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -900,8 +900,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_ModuleDef_tie<T>::create_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -916,8 +916,8 @@ CORBA_ValueDef_ptr POA_CORBA_ModuleDef_tie<T>::create_value  (
     CORBA::Boolean is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -933,8 +933,8 @@ id,
     is_truncatable,
     abstract_base_values,
     supported_interfaces,
-    initializers,
-    ACE_TRY_ENV
+    initializers
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -943,8 +943,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_ModuleDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -954,8 +954,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_ModuleDef_tie<T>::create_value_box  (
 id,
     name,
     version,
-    original_type_def,
-    ACE_TRY_ENV
+    original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -964,8 +964,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_ModuleDef_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -975,8 +975,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_ModuleDef_tie<T>::create_exception  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -984,8 +984,8 @@ template <class T> ACE_INLINE
 CORBA_NativeDef_ptr POA_CORBA_ModuleDef_tie<T>::create_native  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -994,8 +994,8 @@ CORBA_NativeDef_ptr POA_CORBA_ModuleDef_tie<T>::create_native  (
   return this->ptr_->create_native (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1004,8 +1004,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_ModuleDef_tie<T>::create_abstract_inter
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1015,8 +1015,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_ModuleDef_tie<T>::create_abstract_inter
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1025,8 +1025,8 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_ModuleDef_tie<T>::create_local_interface
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1036,144 +1036,144 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_ModuleDef_tie<T>::create_local_interface
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ModuleDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ModuleDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ModuleDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ModuleDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ModuleDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ModuleDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_ModuleDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ModuleDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_ModuleDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_ModuleDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1181,8 +1181,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_ModuleDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1191,63 +1191,63 @@ void POA_CORBA_ModuleDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_ModuleDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ModuleDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_ConstantDef_tie<T>::POA_CORBA_ConstantDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ConstantDef_tie<T>::POA_CORBA_ConstantDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ConstantDef_tie<T>::POA_CORBA_ConstantDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ConstantDef_tie<T>::POA_CORBA_ConstantDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -1291,216 +1291,216 @@ POA_CORBA_ConstantDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_ConstantDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_ConstantDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_ConstantDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_ConstantDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_ConstantDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_CORBA_ConstantDef_tie<T>::type_def  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type_def (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ConstantDef_tie<T>::type_def  (
-    CORBA_IDLType_ptr type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->type_def (
-type_def,
-    ACE_TRY_ENV
+type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Any * POA_CORBA_ConstantDef_tie<T>::value  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->value (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ConstantDef_tie<T>::value  (
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->value (
-value,
-    ACE_TRY_ENV
+value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ConstantDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ConstantDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ConstantDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ConstantDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ConstantDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ConstantDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_ConstantDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ConstantDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_ConstantDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_ConstantDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1508,8 +1508,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_ConstantDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1518,63 +1518,63 @@ void POA_CORBA_ConstantDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_ConstantDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ConstantDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_StructDef_tie<T>::POA_CORBA_StructDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_StructDef_tie<T>::POA_CORBA_StructDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_StructDef_tie<T>::POA_CORBA_StructDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_StructDef_tie<T>::POA_CORBA_StructDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -1618,62 +1618,62 @@ POA_CORBA_StructDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_StructDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_StructDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_StructDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_StructDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_StructMemberSeq * POA_CORBA_StructDef_tie<T>::members  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->members (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_StructDef_tie<T>::members  (
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->members (
-members,
-    ACE_TRY_ENV
+members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_StructDef_tie<T>::lookup  (
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup (
-search_name,
-    ACE_TRY_ENV
+search_name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_StructDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1681,8 +1681,8 @@ CORBA_ContainedSeq * POA_CORBA_StructDef_tie<T>::contents  (
 {
   return this->ptr_->contents (
 limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1691,8 +1691,8 @@ CORBA_ContainedSeq * POA_CORBA_StructDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1702,8 +1702,8 @@ CORBA_ContainedSeq * POA_CORBA_StructDef_tie<T>::lookup_name  (
 search_name,
     levels_to_search,
     limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1711,8 +1711,8 @@ template <class T> ACE_INLINE
 CORBA_Container::DescriptionSeq * POA_CORBA_StructDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Long max_returned_objs
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1721,8 +1721,8 @@ CORBA_Container::DescriptionSeq * POA_CORBA_StructDef_tie<T>::describe_contents
   return this->ptr_->describe_contents (
 limit_type,
     exclude_inherited,
-    max_returned_objs,
-    ACE_TRY_ENV
+    max_returned_objs
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1730,8 +1730,8 @@ template <class T> ACE_INLINE
 CORBA_ModuleDef_ptr POA_CORBA_StructDef_tie<T>::create_module  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1740,8 +1740,8 @@ CORBA_ModuleDef_ptr POA_CORBA_StructDef_tie<T>::create_module  (
   return this->ptr_->create_module (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1751,8 +1751,8 @@ CORBA_ConstantDef_ptr POA_CORBA_StructDef_tie<T>::create_constant  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1763,8 +1763,8 @@ id,
     name,
     version,
     type,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1773,8 +1773,8 @@ CORBA_StructDef_ptr POA_CORBA_StructDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1784,8 +1784,8 @@ CORBA_StructDef_ptr POA_CORBA_StructDef_tie<T>::create_struct  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1795,8 +1795,8 @@ CORBA_UnionDef_ptr POA_CORBA_StructDef_tie<T>::create_union  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1807,8 +1807,8 @@ id,
     name,
     version,
     discriminator_type,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1817,8 +1817,8 @@ CORBA_EnumDef_ptr POA_CORBA_StructDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1828,8 +1828,8 @@ CORBA_EnumDef_ptr POA_CORBA_StructDef_tie<T>::create_enum  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1838,8 +1838,8 @@ CORBA_AliasDef_ptr POA_CORBA_StructDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1849,8 +1849,8 @@ CORBA_AliasDef_ptr POA_CORBA_StructDef_tie<T>::create_alias  (
 id,
     name,
     version,
-    original_type,
-    ACE_TRY_ENV
+    original_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1859,8 +1859,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_StructDef_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1870,8 +1870,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_StructDef_tie<T>::create_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1886,8 +1886,8 @@ CORBA_ValueDef_ptr POA_CORBA_StructDef_tie<T>::create_value  (
     CORBA::Boolean is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1903,8 +1903,8 @@ id,
     is_truncatable,
     abstract_base_values,
     supported_interfaces,
-    initializers,
-    ACE_TRY_ENV
+    initializers
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1913,8 +1913,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_StructDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1924,8 +1924,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_StructDef_tie<T>::create_value_box  (
 id,
     name,
     version,
-    original_type_def,
-    ACE_TRY_ENV
+    original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1934,8 +1934,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_StructDef_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1945,8 +1945,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_StructDef_tie<T>::create_exception  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1954,8 +1954,8 @@ template <class T> ACE_INLINE
 CORBA_NativeDef_ptr POA_CORBA_StructDef_tie<T>::create_native  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1964,8 +1964,8 @@ CORBA_NativeDef_ptr POA_CORBA_StructDef_tie<T>::create_native  (
   return this->ptr_->create_native (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1974,8 +1974,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_StructDef_tie<T>::create_abstract_inter
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1985,8 +1985,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_StructDef_tie<T>::create_abstract_inter
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1995,8 +1995,8 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_StructDef_tie<T>::create_local_interface
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2006,144 +2006,144 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_StructDef_tie<T>::create_local_interface
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_StructDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_StructDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_StructDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_StructDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_StructDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_StructDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_StructDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_StructDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_StructDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_StructDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2151,8 +2151,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_StructDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2161,76 +2161,76 @@ void POA_CORBA_StructDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_StructDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_StructDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_StructDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_UnionDef_tie<T>::POA_CORBA_UnionDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_UnionDef_tie<T>::POA_CORBA_UnionDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_UnionDef_tie<T>::POA_CORBA_UnionDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_UnionDef_tie<T>::POA_CORBA_UnionDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -2274,103 +2274,103 @@ POA_CORBA_UnionDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_UnionDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_UnionDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_UnionDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_UnionDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_UnionDef_tie<T>::discriminator_type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->discriminator_type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_CORBA_UnionDef_tie<T>::discriminator_type_def  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->discriminator_type_def (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_UnionDef_tie<T>::discriminator_type_def  (
-    CORBA_IDLType_ptr discriminator_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr discriminator_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->discriminator_type_def (
-discriminator_type_def,
-    ACE_TRY_ENV
+discriminator_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_UnionMemberSeq * POA_CORBA_UnionDef_tie<T>::members  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->members (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_UnionDef_tie<T>::members  (
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->members (
-members,
-    ACE_TRY_ENV
+members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_UnionDef_tie<T>::lookup  (
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup (
-search_name,
-    ACE_TRY_ENV
+search_name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_UnionDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2378,8 +2378,8 @@ CORBA_ContainedSeq * POA_CORBA_UnionDef_tie<T>::contents  (
 {
   return this->ptr_->contents (
 limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2388,8 +2388,8 @@ CORBA_ContainedSeq * POA_CORBA_UnionDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2399,8 +2399,8 @@ CORBA_ContainedSeq * POA_CORBA_UnionDef_tie<T>::lookup_name  (
 search_name,
     levels_to_search,
     limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2408,8 +2408,8 @@ template <class T> ACE_INLINE
 CORBA_Container::DescriptionSeq * POA_CORBA_UnionDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Long max_returned_objs
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2418,8 +2418,8 @@ CORBA_Container::DescriptionSeq * POA_CORBA_UnionDef_tie<T>::describe_contents
   return this->ptr_->describe_contents (
 limit_type,
     exclude_inherited,
-    max_returned_objs,
-    ACE_TRY_ENV
+    max_returned_objs
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2427,8 +2427,8 @@ template <class T> ACE_INLINE
 CORBA_ModuleDef_ptr POA_CORBA_UnionDef_tie<T>::create_module  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2437,8 +2437,8 @@ CORBA_ModuleDef_ptr POA_CORBA_UnionDef_tie<T>::create_module  (
   return this->ptr_->create_module (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2448,8 +2448,8 @@ CORBA_ConstantDef_ptr POA_CORBA_UnionDef_tie<T>::create_constant  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2460,8 +2460,8 @@ id,
     name,
     version,
     type,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2470,8 +2470,8 @@ CORBA_StructDef_ptr POA_CORBA_UnionDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2481,8 +2481,8 @@ CORBA_StructDef_ptr POA_CORBA_UnionDef_tie<T>::create_struct  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2492,8 +2492,8 @@ CORBA_UnionDef_ptr POA_CORBA_UnionDef_tie<T>::create_union  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2504,8 +2504,8 @@ id,
     name,
     version,
     discriminator_type,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2514,8 +2514,8 @@ CORBA_EnumDef_ptr POA_CORBA_UnionDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2525,8 +2525,8 @@ CORBA_EnumDef_ptr POA_CORBA_UnionDef_tie<T>::create_enum  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2535,8 +2535,8 @@ CORBA_AliasDef_ptr POA_CORBA_UnionDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2546,8 +2546,8 @@ CORBA_AliasDef_ptr POA_CORBA_UnionDef_tie<T>::create_alias  (
 id,
     name,
     version,
-    original_type,
-    ACE_TRY_ENV
+    original_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2556,8 +2556,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_UnionDef_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2567,8 +2567,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_UnionDef_tie<T>::create_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2583,8 +2583,8 @@ CORBA_ValueDef_ptr POA_CORBA_UnionDef_tie<T>::create_value  (
     CORBA::Boolean is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2600,8 +2600,8 @@ id,
     is_truncatable,
     abstract_base_values,
     supported_interfaces,
-    initializers,
-    ACE_TRY_ENV
+    initializers
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2610,8 +2610,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_UnionDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2621,8 +2621,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_UnionDef_tie<T>::create_value_box  (
 id,
     name,
     version,
-    original_type_def,
-    ACE_TRY_ENV
+    original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2631,8 +2631,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_UnionDef_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2642,8 +2642,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_UnionDef_tie<T>::create_exception  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2651,8 +2651,8 @@ template <class T> ACE_INLINE
 CORBA_NativeDef_ptr POA_CORBA_UnionDef_tie<T>::create_native  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2661,8 +2661,8 @@ CORBA_NativeDef_ptr POA_CORBA_UnionDef_tie<T>::create_native  (
   return this->ptr_->create_native (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2671,8 +2671,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_UnionDef_tie<T>::create_abstract_interf
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2682,8 +2682,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_UnionDef_tie<T>::create_abstract_interf
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2692,8 +2692,8 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_UnionDef_tie<T>::create_local_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2703,144 +2703,144 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_UnionDef_tie<T>::create_local_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_UnionDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_UnionDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_UnionDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_UnionDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_UnionDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_UnionDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_UnionDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_UnionDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_UnionDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_UnionDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2848,8 +2848,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_UnionDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2858,76 +2858,76 @@ void POA_CORBA_UnionDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_UnionDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_UnionDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_UnionDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_EnumDef_tie<T>::POA_CORBA_EnumDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_EnumDef_tie<T>::POA_CORBA_EnumDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_EnumDef_tie<T>::POA_CORBA_EnumDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_EnumDef_tie<T>::POA_CORBA_EnumDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -2971,175 +2971,175 @@ POA_CORBA_EnumDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_EnumDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_EnumDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_EnumDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_EnumDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_EnumMemberSeq * POA_CORBA_EnumDef_tie<T>::members  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->members (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_EnumDef_tie<T>::members  (
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->members (
-members,
-    ACE_TRY_ENV
+members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_EnumDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_EnumDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_EnumDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_EnumDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_EnumDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_EnumDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_EnumDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_EnumDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_EnumDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_EnumDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3147,8 +3147,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_EnumDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3157,76 +3157,76 @@ void POA_CORBA_EnumDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_EnumDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_EnumDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_EnumDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_AliasDef_tie<T>::POA_CORBA_AliasDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_AliasDef_tie<T>::POA_CORBA_AliasDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_AliasDef_tie<T>::POA_CORBA_AliasDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_AliasDef_tie<T>::POA_CORBA_AliasDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -3270,175 +3270,175 @@ POA_CORBA_AliasDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_AliasDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_AliasDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_AliasDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_AliasDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_CORBA_AliasDef_tie<T>::original_type_def  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->original_type_def (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AliasDef_tie<T>::original_type_def  (
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->original_type_def (
-original_type_def,
-    ACE_TRY_ENV
+original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AliasDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AliasDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AliasDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AliasDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AliasDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AliasDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_AliasDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AliasDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_AliasDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_AliasDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3446,8 +3446,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_AliasDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3456,76 +3456,76 @@ void POA_CORBA_AliasDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_AliasDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_AliasDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AliasDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_NativeDef_tie<T>::POA_CORBA_NativeDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_NativeDef_tie<T>::POA_CORBA_NativeDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_NativeDef_tie<T>::POA_CORBA_NativeDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_NativeDef_tie<T>::POA_CORBA_NativeDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -3569,147 +3569,147 @@ POA_CORBA_NativeDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_NativeDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_NativeDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_NativeDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_NativeDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_NativeDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_NativeDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_NativeDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_NativeDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_NativeDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_NativeDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_NativeDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_NativeDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_NativeDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_NativeDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3717,8 +3717,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_NativeDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3727,76 +3727,76 @@ void POA_CORBA_NativeDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_NativeDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_NativeDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_NativeDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_PrimitiveDef_tie<T>::POA_CORBA_PrimitiveDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_PrimitiveDef_tie<T>::POA_CORBA_PrimitiveDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_PrimitiveDef_tie<T>::POA_CORBA_PrimitiveDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_PrimitiveDef_tie<T>::POA_CORBA_PrimitiveDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -3840,92 +3840,92 @@ POA_CORBA_PrimitiveDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_PrimitiveDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_PrimitiveDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_PrimitiveDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_PrimitiveDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::PrimitiveKind POA_CORBA_PrimitiveDef_tie<T>::kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_PrimitiveDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_PrimitiveDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_PrimitiveDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_StringDef_tie<T>::POA_CORBA_StringDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_StringDef_tie<T>::POA_CORBA_StringDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_StringDef_tie<T>::POA_CORBA_StringDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_StringDef_tie<T>::POA_CORBA_StringDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -3969,107 +3969,107 @@ POA_CORBA_StringDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_StringDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_StringDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_StringDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_StringDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::ULong POA_CORBA_StringDef_tie<T>::bound  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->bound (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_StringDef_tie<T>::bound  (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->bound (
-bound,
-    ACE_TRY_ENV
+bound
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_StringDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_StringDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_StringDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_WstringDef_tie<T>::POA_CORBA_WstringDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_WstringDef_tie<T>::POA_CORBA_WstringDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_WstringDef_tie<T>::POA_CORBA_WstringDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_WstringDef_tie<T>::POA_CORBA_WstringDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -4113,107 +4113,107 @@ POA_CORBA_WstringDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_WstringDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_WstringDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_WstringDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_WstringDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::ULong POA_CORBA_WstringDef_tie<T>::bound  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->bound (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_WstringDef_tie<T>::bound  (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->bound (
-bound,
-    ACE_TRY_ENV
+bound
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_WstringDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_WstringDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_WstringDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_SequenceDef_tie<T>::POA_CORBA_SequenceDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_SequenceDef_tie<T>::POA_CORBA_SequenceDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_SequenceDef_tie<T>::POA_CORBA_SequenceDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_SequenceDef_tie<T>::POA_CORBA_SequenceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -4257,148 +4257,148 @@ POA_CORBA_SequenceDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_SequenceDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_SequenceDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_SequenceDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_SequenceDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::ULong POA_CORBA_SequenceDef_tie<T>::bound  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->bound (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_SequenceDef_tie<T>::bound  (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->bound (
-bound,
-    ACE_TRY_ENV
+bound
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_SequenceDef_tie<T>::element_type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->element_type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_CORBA_SequenceDef_tie<T>::element_type_def  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->element_type_def (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_SequenceDef_tie<T>::element_type_def  (
-    CORBA_IDLType_ptr element_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr element_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->element_type_def (
-element_type_def,
-    ACE_TRY_ENV
+element_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_SequenceDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_SequenceDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_SequenceDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_ArrayDef_tie<T>::POA_CORBA_ArrayDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ArrayDef_tie<T>::POA_CORBA_ArrayDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ArrayDef_tie<T>::POA_CORBA_ArrayDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ArrayDef_tie<T>::POA_CORBA_ArrayDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -4442,148 +4442,148 @@ POA_CORBA_ArrayDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_ArrayDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_ArrayDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_ArrayDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_ArrayDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::ULong POA_CORBA_ArrayDef_tie<T>::length  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->length (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ArrayDef_tie<T>::length  (
-    CORBA::ULong length,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong length
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->length (
-length,
-    ACE_TRY_ENV
+length
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_ArrayDef_tie<T>::element_type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->element_type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_CORBA_ArrayDef_tie<T>::element_type_def  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->element_type_def (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ArrayDef_tie<T>::element_type_def  (
-    CORBA_IDLType_ptr element_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr element_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->element_type_def (
-element_type_def,
-    ACE_TRY_ENV
+element_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_ArrayDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_ArrayDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ArrayDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_ExceptionDef_tie<T>::POA_CORBA_ExceptionDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ExceptionDef_tie<T>::POA_CORBA_ExceptionDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ExceptionDef_tie<T>::POA_CORBA_ExceptionDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ExceptionDef_tie<T>::POA_CORBA_ExceptionDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -4627,188 +4627,188 @@ POA_CORBA_ExceptionDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_ExceptionDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_ExceptionDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_ExceptionDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_ExceptionDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_ExceptionDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_StructMemberSeq * POA_CORBA_ExceptionDef_tie<T>::members  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->members (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ExceptionDef_tie<T>::members  (
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->members (
-members,
-    ACE_TRY_ENV
+members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ExceptionDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ExceptionDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ExceptionDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ExceptionDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ExceptionDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ExceptionDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_ExceptionDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ExceptionDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_ExceptionDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_ExceptionDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4816,8 +4816,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_ExceptionDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4826,31 +4826,31 @@ void POA_CORBA_ExceptionDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_ExceptionDef_tie<T>::lookup  (
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup (
-search_name,
-    ACE_TRY_ENV
+search_name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_ExceptionDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4858,8 +4858,8 @@ CORBA_ContainedSeq * POA_CORBA_ExceptionDef_tie<T>::contents  (
 {
   return this->ptr_->contents (
 limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4868,8 +4868,8 @@ CORBA_ContainedSeq * POA_CORBA_ExceptionDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4879,8 +4879,8 @@ CORBA_ContainedSeq * POA_CORBA_ExceptionDef_tie<T>::lookup_name  (
 search_name,
     levels_to_search,
     limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4888,8 +4888,8 @@ template <class T> ACE_INLINE
 CORBA_Container::DescriptionSeq * POA_CORBA_ExceptionDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Long max_returned_objs
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4898,8 +4898,8 @@ CORBA_Container::DescriptionSeq * POA_CORBA_ExceptionDef_tie<T>::describe_conten
   return this->ptr_->describe_contents (
 limit_type,
     exclude_inherited,
-    max_returned_objs,
-    ACE_TRY_ENV
+    max_returned_objs
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4907,8 +4907,8 @@ template <class T> ACE_INLINE
 CORBA_ModuleDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_module  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4917,8 +4917,8 @@ CORBA_ModuleDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_module  (
   return this->ptr_->create_module (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4928,8 +4928,8 @@ CORBA_ConstantDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_constant  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4940,8 +4940,8 @@ id,
     name,
     version,
     type,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4950,8 +4950,8 @@ CORBA_StructDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4961,8 +4961,8 @@ CORBA_StructDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_struct  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4972,8 +4972,8 @@ CORBA_UnionDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_union  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4984,8 +4984,8 @@ id,
     name,
     version,
     discriminator_type,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4994,8 +4994,8 @@ CORBA_EnumDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5005,8 +5005,8 @@ CORBA_EnumDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_enum  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -5015,8 +5015,8 @@ CORBA_AliasDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5026,8 +5026,8 @@ CORBA_AliasDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_alias  (
 id,
     name,
     version,
-    original_type,
-    ACE_TRY_ENV
+    original_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -5036,8 +5036,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5047,8 +5047,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -5063,8 +5063,8 @@ CORBA_ValueDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_value  (
     CORBA::Boolean is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5080,8 +5080,8 @@ id,
     is_truncatable,
     abstract_base_values,
     supported_interfaces,
-    initializers,
-    ACE_TRY_ENV
+    initializers
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -5090,8 +5090,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5101,8 +5101,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_value_box  (
 id,
     name,
     version,
-    original_type_def,
-    ACE_TRY_ENV
+    original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -5111,8 +5111,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5122,8 +5122,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_exception  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -5131,8 +5131,8 @@ template <class T> ACE_INLINE
 CORBA_NativeDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_native  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5141,8 +5141,8 @@ CORBA_NativeDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_native  (
   return this->ptr_->create_native (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -5151,8 +5151,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_abstract_in
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5162,8 +5162,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_abstract_in
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -5172,8 +5172,8 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_local_interfac
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5183,63 +5183,63 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_local_interfac
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_ExceptionDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ExceptionDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_AttributeDef_tie<T>::POA_CORBA_AttributeDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_AttributeDef_tie<T>::POA_CORBA_AttributeDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_AttributeDef_tie<T>::POA_CORBA_AttributeDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_AttributeDef_tie<T>::POA_CORBA_AttributeDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -5283,216 +5283,216 @@ POA_CORBA_AttributeDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_AttributeDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_AttributeDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_AttributeDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_AttributeDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_AttributeDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_CORBA_AttributeDef_tie<T>::type_def  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type_def (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AttributeDef_tie<T>::type_def  (
-    CORBA_IDLType_ptr type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->type_def (
-type_def,
-    ACE_TRY_ENV
+type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::AttributeMode POA_CORBA_AttributeDef_tie<T>::mode  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->mode (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AttributeDef_tie<T>::mode  (
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::AttributeMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->mode (
-mode,
-    ACE_TRY_ENV
+mode
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AttributeDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AttributeDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AttributeDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AttributeDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AttributeDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AttributeDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_AttributeDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AttributeDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_AttributeDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_AttributeDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5500,8 +5500,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_AttributeDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5510,63 +5510,63 @@ void POA_CORBA_AttributeDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_AttributeDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AttributeDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_OperationDef_tie<T>::POA_CORBA_OperationDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_OperationDef_tie<T>::POA_CORBA_OperationDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_OperationDef_tie<T>::POA_CORBA_OperationDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_OperationDef_tie<T>::POA_CORBA_OperationDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -5610,300 +5610,300 @@ POA_CORBA_OperationDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_OperationDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_OperationDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_OperationDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_OperationDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_OperationDef_tie<T>::result  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->result (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_CORBA_OperationDef_tie<T>::result_def  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->result_def (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::result_def  (
-    CORBA_IDLType_ptr result_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr result_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->result_def (
-result_def,
-    ACE_TRY_ENV
+result_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ParDescriptionSeq * POA_CORBA_OperationDef_tie<T>::params  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->params (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::params  (
-    const CORBA_ParDescriptionSeq & params,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ParDescriptionSeq & params
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->params (
-params,
-    ACE_TRY_ENV
+params
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::OperationMode POA_CORBA_OperationDef_tie<T>::mode  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->mode (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::mode  (
-    CORBA::OperationMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::OperationMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->mode (
-mode,
-    ACE_TRY_ENV
+mode
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContextIdSeq * POA_CORBA_OperationDef_tie<T>::contexts  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->contexts (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::contexts  (
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->contexts (
-contexts,
-    ACE_TRY_ENV
+contexts
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ExceptionDefSeq * POA_CORBA_OperationDef_tie<T>::exceptions  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->exceptions (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::exceptions  (
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->exceptions (
-exceptions,
-    ACE_TRY_ENV
+exceptions
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_OperationDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_OperationDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_OperationDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_OperationDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_OperationDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_OperationDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_OperationDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5911,8 +5911,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5921,63 +5921,63 @@ void POA_CORBA_OperationDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_OperationDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_InterfaceDef_tie<T>::POA_CORBA_InterfaceDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_InterfaceDef_tie<T>::POA_CORBA_InterfaceDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_InterfaceDef_tie<T>::POA_CORBA_InterfaceDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_InterfaceDef_tie<T>::POA_CORBA_InterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -6021,67 +6021,67 @@ POA_CORBA_InterfaceDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_InterfaceDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_InterfaceDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_InterfaceDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_InterfaceDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDefSeq * POA_CORBA_InterfaceDef_tie<T>::base_interfaces  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_InterfaceDef_tie<T>::base_interfaces  (
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->base_interfaces (
-base_interfaces,
-    ACE_TRY_ENV
+base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_CORBA_InterfaceDef_tie<T>::is_a  (
-    const char * interface_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * interface_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_a (
-interface_id,
-    ACE_TRY_ENV
+interface_id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDef::FullInterfaceDescription * POA_CORBA_InterfaceDef_tie<T>::describe_interface  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6091,8 +6091,8 @@ CORBA_AttributeDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_attribute  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::AttributeMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6103,8 +6103,8 @@ id,
     name,
     version,
     type,
-    mode,
-    ACE_TRY_ENV
+    mode
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6117,8 +6117,8 @@ CORBA_OperationDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_operation  (
     CORBA::OperationMode mode,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6132,31 +6132,31 @@ id,
     mode,
     params,
     exceptions,
-    contexts,
-    ACE_TRY_ENV
+    contexts
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_InterfaceDef_tie<T>::lookup  (
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup (
-search_name,
-    ACE_TRY_ENV
+search_name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_InterfaceDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6164,8 +6164,8 @@ CORBA_ContainedSeq * POA_CORBA_InterfaceDef_tie<T>::contents  (
 {
   return this->ptr_->contents (
 limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6174,8 +6174,8 @@ CORBA_ContainedSeq * POA_CORBA_InterfaceDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6185,8 +6185,8 @@ CORBA_ContainedSeq * POA_CORBA_InterfaceDef_tie<T>::lookup_name  (
 search_name,
     levels_to_search,
     limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6194,8 +6194,8 @@ template <class T> ACE_INLINE
 CORBA_Container::DescriptionSeq * POA_CORBA_InterfaceDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Long max_returned_objs
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6204,8 +6204,8 @@ CORBA_Container::DescriptionSeq * POA_CORBA_InterfaceDef_tie<T>::describe_conten
   return this->ptr_->describe_contents (
 limit_type,
     exclude_inherited,
-    max_returned_objs,
-    ACE_TRY_ENV
+    max_returned_objs
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6213,8 +6213,8 @@ template <class T> ACE_INLINE
 CORBA_ModuleDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_module  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6223,8 +6223,8 @@ CORBA_ModuleDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_module  (
   return this->ptr_->create_module (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6234,8 +6234,8 @@ CORBA_ConstantDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_constant  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6246,8 +6246,8 @@ id,
     name,
     version,
     type,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6256,8 +6256,8 @@ CORBA_StructDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6267,8 +6267,8 @@ CORBA_StructDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_struct  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6278,8 +6278,8 @@ CORBA_UnionDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_union  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6290,8 +6290,8 @@ id,
     name,
     version,
     discriminator_type,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6300,8 +6300,8 @@ CORBA_EnumDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6311,8 +6311,8 @@ CORBA_EnumDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_enum  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6321,8 +6321,8 @@ CORBA_AliasDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6332,8 +6332,8 @@ CORBA_AliasDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_alias  (
 id,
     name,
     version,
-    original_type,
-    ACE_TRY_ENV
+    original_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6342,8 +6342,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6353,8 +6353,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6369,8 +6369,8 @@ CORBA_ValueDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_value  (
     CORBA::Boolean is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6386,8 +6386,8 @@ id,
     is_truncatable,
     abstract_base_values,
     supported_interfaces,
-    initializers,
-    ACE_TRY_ENV
+    initializers
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6396,8 +6396,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6407,8 +6407,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_value_box  (
 id,
     name,
     version,
-    original_type_def,
-    ACE_TRY_ENV
+    original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6417,8 +6417,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6428,8 +6428,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_exception  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6437,8 +6437,8 @@ template <class T> ACE_INLINE
 CORBA_NativeDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_native  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6447,8 +6447,8 @@ CORBA_NativeDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_native  (
   return this->ptr_->create_native (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6457,8 +6457,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_abstract_in
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6468,8 +6468,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_abstract_in
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6478,8 +6478,8 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_local_interfac
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6489,144 +6489,144 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_local_interfac
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_InterfaceDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_InterfaceDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_InterfaceDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_InterfaceDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_InterfaceDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_InterfaceDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_InterfaceDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_InterfaceDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_InterfaceDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_InterfaceDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6634,8 +6634,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_InterfaceDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6644,76 +6644,76 @@ void POA_CORBA_InterfaceDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_InterfaceDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_InterfaceDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_InterfaceDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_AbstractInterfaceDef_tie<T>::POA_CORBA_AbstractInterfaceDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_AbstractInterfaceDef_tie<T>::POA_CORBA_AbstractInterfaceDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_AbstractInterfaceDef_tie<T>::POA_CORBA_AbstractInterfaceDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_AbstractInterfaceDef_tie<T>::POA_CORBA_AbstractInterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -6757,67 +6757,67 @@ POA_CORBA_AbstractInterfaceDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_AbstractInterfaceDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_AbstractInterfaceDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_AbstractInterfaceDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_AbstractInterfaceDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDefSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::base_interfaces  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AbstractInterfaceDef_tie<T>::base_interfaces  (
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->base_interfaces (
-base_interfaces,
-    ACE_TRY_ENV
+base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_CORBA_AbstractInterfaceDef_tie<T>::is_a  (
-    const char * interface_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * interface_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_a (
-interface_id,
-    ACE_TRY_ENV
+interface_id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDef::FullInterfaceDescription * POA_CORBA_AbstractInterfaceDef_tie<T>::describe_interface  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6827,8 +6827,8 @@ CORBA_AttributeDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_attribute
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::AttributeMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6839,8 +6839,8 @@ id,
     name,
     version,
     type,
-    mode,
-    ACE_TRY_ENV
+    mode
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6853,8 +6853,8 @@ CORBA_OperationDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_operation
     CORBA::OperationMode mode,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6868,31 +6868,31 @@ id,
     mode,
     params,
     exceptions,
-    contexts,
-    ACE_TRY_ENV
+    contexts
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::lookup  (
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup (
-search_name,
-    ACE_TRY_ENV
+search_name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6900,8 +6900,8 @@ CORBA_ContainedSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::contents  (
 {
   return this->ptr_->contents (
 limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6910,8 +6910,8 @@ CORBA_ContainedSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6921,8 +6921,8 @@ CORBA_ContainedSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::lookup_name  (
 search_name,
     levels_to_search,
     limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6930,8 +6930,8 @@ template <class T> ACE_INLINE
 CORBA_Container::DescriptionSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Long max_returned_objs
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6940,8 +6940,8 @@ CORBA_Container::DescriptionSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::describ
   return this->ptr_->describe_contents (
 limit_type,
     exclude_inherited,
-    max_returned_objs,
-    ACE_TRY_ENV
+    max_returned_objs
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6949,8 +6949,8 @@ template <class T> ACE_INLINE
 CORBA_ModuleDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_module  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6959,8 +6959,8 @@ CORBA_ModuleDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_module  (
   return this->ptr_->create_module (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6970,8 +6970,8 @@ CORBA_ConstantDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_constant  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6982,8 +6982,8 @@ id,
     name,
     version,
     type,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6992,8 +6992,8 @@ CORBA_StructDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7003,8 +7003,8 @@ CORBA_StructDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_struct  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7014,8 +7014,8 @@ CORBA_UnionDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_union  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7026,8 +7026,8 @@ id,
     name,
     version,
     discriminator_type,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7036,8 +7036,8 @@ CORBA_EnumDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7047,8 +7047,8 @@ CORBA_EnumDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_enum  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7057,8 +7057,8 @@ CORBA_AliasDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7068,8 +7068,8 @@ CORBA_AliasDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_alias  (
 id,
     name,
     version,
-    original_type,
-    ACE_TRY_ENV
+    original_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7078,8 +7078,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_interface
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7089,8 +7089,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_interface
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7105,8 +7105,8 @@ CORBA_ValueDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_value  (
     CORBA::Boolean is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7122,8 +7122,8 @@ id,
     is_truncatable,
     abstract_base_values,
     supported_interfaces,
-    initializers,
-    ACE_TRY_ENV
+    initializers
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7132,8 +7132,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7143,8 +7143,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_value_box  (
 id,
     name,
     version,
-    original_type_def,
-    ACE_TRY_ENV
+    original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7153,8 +7153,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_exception
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7164,8 +7164,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_exception
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7173,8 +7173,8 @@ template <class T> ACE_INLINE
 CORBA_NativeDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_native  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7183,8 +7183,8 @@ CORBA_NativeDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_native  (
   return this->ptr_->create_native (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7193,8 +7193,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_abs
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7204,8 +7204,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_abs
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7214,8 +7214,8 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_local_
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7225,144 +7225,144 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_local_
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AbstractInterfaceDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AbstractInterfaceDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AbstractInterfaceDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AbstractInterfaceDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AbstractInterfaceDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AbstractInterfaceDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AbstractInterfaceDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_AbstractInterfaceDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7370,8 +7370,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_AbstractInterfaceDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7380,76 +7380,76 @@ void POA_CORBA_AbstractInterfaceDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_AbstractInterfaceDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AbstractInterfaceDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_LocalInterfaceDef_tie<T>::POA_CORBA_LocalInterfaceDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_LocalInterfaceDef_tie<T>::POA_CORBA_LocalInterfaceDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_LocalInterfaceDef_tie<T>::POA_CORBA_LocalInterfaceDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_LocalInterfaceDef_tie<T>::POA_CORBA_LocalInterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -7493,67 +7493,67 @@ POA_CORBA_LocalInterfaceDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_LocalInterfaceDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_LocalInterfaceDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_LocalInterfaceDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_LocalInterfaceDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDefSeq * POA_CORBA_LocalInterfaceDef_tie<T>::base_interfaces  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_LocalInterfaceDef_tie<T>::base_interfaces  (
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->base_interfaces (
-base_interfaces,
-    ACE_TRY_ENV
+base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_CORBA_LocalInterfaceDef_tie<T>::is_a  (
-    const char * interface_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * interface_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_a (
-interface_id,
-    ACE_TRY_ENV
+interface_id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDef::FullInterfaceDescription * POA_CORBA_LocalInterfaceDef_tie<T>::describe_interface  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7563,8 +7563,8 @@ CORBA_AttributeDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_attribute  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::AttributeMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7575,8 +7575,8 @@ id,
     name,
     version,
     type,
-    mode,
-    ACE_TRY_ENV
+    mode
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7589,8 +7589,8 @@ CORBA_OperationDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_operation  (
     CORBA::OperationMode mode,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7604,31 +7604,31 @@ id,
     mode,
     params,
     exceptions,
-    contexts,
-    ACE_TRY_ENV
+    contexts
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_LocalInterfaceDef_tie<T>::lookup  (
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup (
-search_name,
-    ACE_TRY_ENV
+search_name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_LocalInterfaceDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7636,8 +7636,8 @@ CORBA_ContainedSeq * POA_CORBA_LocalInterfaceDef_tie<T>::contents  (
 {
   return this->ptr_->contents (
 limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7646,8 +7646,8 @@ CORBA_ContainedSeq * POA_CORBA_LocalInterfaceDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7657,8 +7657,8 @@ CORBA_ContainedSeq * POA_CORBA_LocalInterfaceDef_tie<T>::lookup_name  (
 search_name,
     levels_to_search,
     limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7666,8 +7666,8 @@ template <class T> ACE_INLINE
 CORBA_Container::DescriptionSeq * POA_CORBA_LocalInterfaceDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Long max_returned_objs
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7676,8 +7676,8 @@ CORBA_Container::DescriptionSeq * POA_CORBA_LocalInterfaceDef_tie<T>::describe_c
   return this->ptr_->describe_contents (
 limit_type,
     exclude_inherited,
-    max_returned_objs,
-    ACE_TRY_ENV
+    max_returned_objs
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7685,8 +7685,8 @@ template <class T> ACE_INLINE
 CORBA_ModuleDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_module  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7695,8 +7695,8 @@ CORBA_ModuleDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_module  (
   return this->ptr_->create_module (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7706,8 +7706,8 @@ CORBA_ConstantDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_constant  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7718,8 +7718,8 @@ id,
     name,
     version,
     type,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7728,8 +7728,8 @@ CORBA_StructDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7739,8 +7739,8 @@ CORBA_StructDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_struct  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7750,8 +7750,8 @@ CORBA_UnionDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_union  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7762,8 +7762,8 @@ id,
     name,
     version,
     discriminator_type,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7772,8 +7772,8 @@ CORBA_EnumDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7783,8 +7783,8 @@ CORBA_EnumDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_enum  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7793,8 +7793,8 @@ CORBA_AliasDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7804,8 +7804,8 @@ CORBA_AliasDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_alias  (
 id,
     name,
     version,
-    original_type,
-    ACE_TRY_ENV
+    original_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7814,8 +7814,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7825,8 +7825,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7841,8 +7841,8 @@ CORBA_ValueDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_value  (
     CORBA::Boolean is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7858,8 +7858,8 @@ id,
     is_truncatable,
     abstract_base_values,
     supported_interfaces,
-    initializers,
-    ACE_TRY_ENV
+    initializers
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7868,8 +7868,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7879,8 +7879,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_value_box  (
 id,
     name,
     version,
-    original_type_def,
-    ACE_TRY_ENV
+    original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7889,8 +7889,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7900,8 +7900,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_exception  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7909,8 +7909,8 @@ template <class T> ACE_INLINE
 CORBA_NativeDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_native  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7919,8 +7919,8 @@ CORBA_NativeDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_native  (
   return this->ptr_->create_native (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7929,8 +7929,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_abstra
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7940,8 +7940,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_abstra
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7950,8 +7950,8 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_local_int
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7961,144 +7961,144 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_local_int
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_LocalInterfaceDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_LocalInterfaceDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_LocalInterfaceDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_LocalInterfaceDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_LocalInterfaceDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_LocalInterfaceDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_LocalInterfaceDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_LocalInterfaceDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_LocalInterfaceDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_LocalInterfaceDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8106,8 +8106,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_LocalInterfaceDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -8116,47 +8116,47 @@ void POA_CORBA_LocalInterfaceDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_LocalInterfaceDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_LocalInterfaceDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_LocalInterfaceDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp
index 39e0d457fa2..929682e2d11 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp
@@ -215,36 +215,32 @@ public:
     const char * name,
     const char * version,
     IR::ComponentDef_ptr base_component,
-    const CORBA_InterfaceDefSeq & supports_interfaces,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_InterfaceDefSeq & supports_interfaces
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::ComponentDef_ptr result);
@@ -271,8 +267,8 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::TAO_ServerRequest
     const char * name,
     const char * version,
     IR::ComponentDef_ptr base_component,
-    const CORBA_InterfaceDefSeq & supports_interfaces,
-    CORBA::Environment &
+    const CORBA_InterfaceDefSeq & supports_interfaces
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -284,12 +280,12 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::TAO_ServerRequest
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentRepository_create_component::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentRepository_create_component::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -317,25 +313,25 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::arguments (CORBA:
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentRepository_create_component::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentRepository_create_component::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentRepository_create_component::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentRepository_create_component::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -347,7 +343,7 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::result (CORBA::En
 
 char *
 TAO_ServerRequestInfo_IR_ComponentRepository_create_component::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -356,11 +352,11 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::target_most_deriv
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentRepository_create_component::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -382,36 +378,32 @@ public:
     const char * version,
     IR::HomeDef_ptr base_home,
     IR::ComponentDef_ptr managed_component,
-    CORBA_ValueDef_ptr primary_key,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_ValueDef_ptr primary_key
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::HomeDef_ptr result);
@@ -440,8 +432,8 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::TAO_ServerRequestInfo_
     const char * version,
     IR::HomeDef_ptr base_home,
     IR::ComponentDef_ptr managed_component,
-    CORBA_ValueDef_ptr primary_key,
-    CORBA::Environment &
+    CORBA_ValueDef_ptr primary_key
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -454,12 +446,12 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::TAO_ServerRequestInfo_
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentRepository_create_home::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentRepository_create_home::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -490,25 +482,25 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::arguments (CORBA::Envi
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentRepository_create_home::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentRepository_create_home::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentRepository_create_home::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentRepository_create_home::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -520,7 +512,7 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::result (CORBA::Environ
 
 char *
 TAO_ServerRequestInfo_IR_ComponentRepository_create_home::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -529,11 +521,11 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::target_most_derived_in
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentRepository_create_home::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -572,18 +564,18 @@ POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::~_TAO_ComponentReposi
 
 IR::_TAO_ComponentRepository_Proxy_Impl&
 POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::select_proxy (
-    ::IR::ComponentRepository *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::IR::ComponentRepository *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -592,8 +584,8 @@ POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::select_proxy (
 
 void
 POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -667,8 +659,8 @@ IR::ComponentDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create
     const char * name,
     const char * version,
     IR::ComponentDef_ptr base_component,
-    const CORBA_InterfaceDefSeq & supports_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & supports_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -683,8 +675,8 @@ IR::ComponentDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_component",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -697,8 +689,8 @@ IR::ComponentDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create
         name,
         version,
         base_component,
-        supports_interfaces,
-        ACE_TRY_ENV
+        supports_interfaces
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -709,8 +701,8 @@ IR::HomeDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_home
     const char * version,
     IR::HomeDef_ptr base_home,
     IR::ComponentDef_ptr managed_component,
-    CORBA_ValueDef_ptr primary_key,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_ValueDef_ptr primary_key
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -725,8 +717,8 @@ IR::HomeDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_home
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_home",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -740,8 +732,8 @@ IR::HomeDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_home
         version,
         base_home,
         managed_component,
-        primary_key,
-        ACE_TRY_ENV
+        primary_key
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -771,8 +763,8 @@ POA_IR::ComponentRepository::~ComponentRepository (void)
 void POA_IR::ComponentRepository::create_component_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -812,13 +804,13 @@ void POA_IR::ComponentRepository::create_component_skel (
       name.in (),
       version.in (),
       base_component.in (),
-      supports_interfaces,
-      ACE_TRY_ENV
+      supports_interfaces
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -828,8 +820,8 @@ void POA_IR::ComponentRepository::create_component_skel (
           name.in (),
           version.in (),
           base_component.in (),
-          supports_interfaces,
-          ACE_TRY_ENV
+          supports_interfaces
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -838,20 +830,20 @@ void POA_IR::ComponentRepository::create_component_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -873,16 +865,13 @@ void POA_IR::ComponentRepository::create_component_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentRepository::create_home_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -925,13 +914,13 @@ void POA_IR::ComponentRepository::create_home_skel (
       version.in (),
       base_home.in (),
       managed_component.in (),
-      primary_key.in (),
-      ACE_TRY_ENV
+      primary_key.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -942,8 +931,8 @@ void POA_IR::ComponentRepository::create_home_skel (
           version.in (),
           base_home.in (),
           managed_component.in (),
-          primary_key.in (),
-          ACE_TRY_ENV
+          primary_key.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -952,20 +941,20 @@ void POA_IR::ComponentRepository::create_home_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -987,16 +976,13 @@ void POA_IR::ComponentRepository::create_home_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentRepository::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -1006,7 +992,7 @@ void POA_IR::ComponentRepository::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -1018,12 +1004,12 @@ void POA_IR::ComponentRepository::_is_a_skel (
 void POA_IR::ComponentRepository::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentRepository *_tao_impl = (POA_IR::ComponentRepository *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -1035,8 +1021,8 @@ void POA_IR::ComponentRepository::_non_existent_skel (
 void POA_IR::ComponentRepository::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentRepository *_tao_impl = (POA_IR::ComponentRepository *) _tao_object_reference;
@@ -1055,7 +1041,7 @@ void POA_IR::ComponentRepository::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -1081,11 +1067,11 @@ void POA_IR::ComponentRepository::_interface_skel (
 }
 
 CORBA::Boolean POA_IR::ComponentRepository::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -1116,12 +1102,12 @@ void* POA_IR::ComponentRepository::_downcast (
   return 0;
 }
 
-void POA_IR::ComponentRepository::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_IR::ComponentRepository::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -1131,9 +1117,9 @@ const char* POA_IR::ComponentRepository::_interface_repository_id (void) const
 }
 
 IR::ComponentRepository*
-POA_IR::ComponentRepository::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_IR::ComponentRepository::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -1299,36 +1285,32 @@ public:
   TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ProvidesDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_InterfaceDef_ptr result);
@@ -1345,45 +1327,45 @@ private:
 TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::ProvidesDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::ProvidesDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1395,7 +1377,7 @@ TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::result (CORBA::Environm
 
 char *
 TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1404,11 +1386,11 @@ TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::target_most_derived_int
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1447,18 +1429,18 @@ POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::~_TAO_ProvidesDef_Strategized
 
 IR::_TAO_ProvidesDef_Proxy_Impl&
 POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::select_proxy (
-    ::IR::ProvidesDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::IR::ProvidesDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -1467,8 +1449,8 @@ POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -1537,8 +1519,8 @@ POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::_TAO_ProvidesDef_ThruPOA_Proxy_Impl
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA_InterfaceDef_ptr POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::interface_type (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1553,8 +1535,8 @@ CORBA_InterfaceDef_ptr POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::interface_ty
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "interface_type",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -1563,7 +1545,7 @@ CORBA_InterfaceDef_ptr POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::interface_ty
           "IDL:omg.org/IR/ProvidesDef:1.0"
         )
     )->interface_type (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -1592,8 +1574,8 @@ POA_IR::ProvidesDef::~ProvidesDef (void)
 void POA_IR::ProvidesDef::_get_interface_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ProvidesDef *_tao_impl =
@@ -1613,19 +1595,19 @@ void POA_IR::ProvidesDef::_get_interface_type_skel (
   TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->interface_type (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -1634,20 +1616,20 @@ void POA_IR::ProvidesDef::_get_interface_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1669,16 +1651,13 @@ void POA_IR::ProvidesDef::_get_interface_type_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ProvidesDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -1688,7 +1667,7 @@ void POA_IR::ProvidesDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -1700,12 +1679,12 @@ void POA_IR::ProvidesDef::_is_a_skel (
 void POA_IR::ProvidesDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ProvidesDef *_tao_impl = (POA_IR::ProvidesDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -1717,8 +1696,8 @@ void POA_IR::ProvidesDef::_non_existent_skel (
 void POA_IR::ProvidesDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ProvidesDef *_tao_impl = (POA_IR::ProvidesDef *) _tao_object_reference;
@@ -1737,7 +1716,7 @@ void POA_IR::ProvidesDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -1763,11 +1742,11 @@ void POA_IR::ProvidesDef::_interface_skel (
 }
 
 CORBA::Boolean POA_IR::ProvidesDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -1795,12 +1774,12 @@ void* POA_IR::ProvidesDef::_downcast (
   return 0;
 }
 
-void POA_IR::ProvidesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_IR::ProvidesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -1810,9 +1789,9 @@ const char* POA_IR::ProvidesDef::_interface_repository_id (void) const
 }
 
 IR::ProvidesDef*
-POA_IR::ProvidesDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_IR::ProvidesDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -1979,36 +1958,32 @@ public:
   TAO_ServerRequestInfo_IR_UsesDef_interface_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::UsesDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_InterfaceDef_ptr result);
@@ -2025,45 +2000,45 @@ private:
 TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::UsesDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::UsesDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -2075,7 +2050,7 @@ TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2084,11 +2059,11 @@ TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::target_most_derived_interfa
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -2104,36 +2079,32 @@ public:
   TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::UsesDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -2150,45 +2121,45 @@ private:
 TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::UsesDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::UsesDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -2200,7 +2171,7 @@ TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Environment &AC
 
 char *
 TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2209,11 +2180,11 @@ TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -2252,18 +2223,18 @@ POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::~_TAO_UsesDef_Strategized_Proxy_B
 
 IR::_TAO_UsesDef_Proxy_Impl&
 POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::select_proxy (
-    ::IR::UsesDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::IR::UsesDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -2272,8 +2243,8 @@ POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -2342,8 +2313,8 @@ POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_TAO_UsesDef_ThruPOA_Proxy_Impl (void)
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA_InterfaceDef_ptr POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::interface_type (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2358,8 +2329,8 @@ CORBA_InterfaceDef_ptr POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::interface_type (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "interface_type",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2368,13 +2339,13 @@ CORBA_InterfaceDef_ptr POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::interface_type (
           "IDL:omg.org/IR/UsesDef:1.0"
         )
     )->interface_type (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA::Boolean POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::is_multiple (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2389,8 +2360,8 @@ CORBA::Boolean POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::is_multiple (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "is_multiple",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -2399,7 +2370,7 @@ CORBA::Boolean POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::is_multiple (
           "IDL:omg.org/IR/UsesDef:1.0"
         )
     )->is_multiple (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -2428,8 +2399,8 @@ POA_IR::UsesDef::~UsesDef (void)
 void POA_IR::UsesDef::_get_interface_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::UsesDef *_tao_impl =
@@ -2449,19 +2420,19 @@ void POA_IR::UsesDef::_get_interface_type_skel (
   TAO_ServerRequestInfo_IR_UsesDef_interface_type_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->interface_type (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2470,20 +2441,20 @@ void POA_IR::UsesDef::_get_interface_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2505,16 +2476,13 @@ void POA_IR::UsesDef::_get_interface_type_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::UsesDef::_get_is_multiple_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::UsesDef *_tao_impl =
@@ -2534,19 +2502,19 @@ void POA_IR::UsesDef::_get_is_multiple_skel (
   TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_multiple (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2554,20 +2522,20 @@ void POA_IR::UsesDef::_get_is_multiple_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2589,16 +2557,13 @@ void POA_IR::UsesDef::_get_is_multiple_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::UsesDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2608,7 +2573,7 @@ void POA_IR::UsesDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -2620,12 +2585,12 @@ void POA_IR::UsesDef::_is_a_skel (
 void POA_IR::UsesDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::UsesDef *_tao_impl = (POA_IR::UsesDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -2637,8 +2602,8 @@ void POA_IR::UsesDef::_non_existent_skel (
 void POA_IR::UsesDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::UsesDef *_tao_impl = (POA_IR::UsesDef *) _tao_object_reference;
@@ -2657,7 +2622,7 @@ void POA_IR::UsesDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -2683,11 +2648,11 @@ void POA_IR::UsesDef::_interface_skel (
 }
 
 CORBA::Boolean POA_IR::UsesDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -2715,12 +2680,12 @@ void* POA_IR::UsesDef::_downcast (
   return 0;
 }
 
-void POA_IR::UsesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_IR::UsesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -2730,9 +2695,9 @@ const char* POA_IR::UsesDef::_interface_repository_id (void) const
 }
 
 IR::UsesDef*
-POA_IR::UsesDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_IR::UsesDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -2900,36 +2865,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::EventDef *tao_impl
     ,
-    const char * event_id,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * event_id
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -2948,8 +2909,8 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::TAO_ServerRequestInfo_IR_EventDef_is_a (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_IR::EventDef *tao_impl,
-    const char * event_id,
-    CORBA::Environment &
+    const char * event_id
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -2957,12 +2918,12 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::TAO_ServerRequestInfo_IR_EventDef_is_a (
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_EventDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_EventDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -2978,25 +2939,25 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::arguments (CORBA::Environment &ACE_TRY_E
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_EventDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_EventDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_EventDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_EventDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -3008,7 +2969,7 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
 
 char *
 TAO_ServerRequestInfo_IR_EventDef_is_a::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3017,11 +2978,11 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_EventDef_is_a::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -3037,36 +2998,32 @@ public:
   TAO_ServerRequestInfo_IR_EventDef_event_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::EventDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ValueDef_ptr result);
@@ -3083,45 +3040,45 @@ private:
 TAO_ServerRequestInfo_IR_EventDef_event_get::TAO_ServerRequestInfo_IR_EventDef_event_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::EventDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::EventDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_EventDef_event_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_EventDef_event_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_EventDef_event_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_EventDef_event_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_EventDef_event_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_EventDef_event_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -3133,7 +3090,7 @@ TAO_ServerRequestInfo_IR_EventDef_event_get::result (CORBA::Environment &ACE_TRY
 
 char *
 TAO_ServerRequestInfo_IR_EventDef_event_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3142,11 +3099,11 @@ TAO_ServerRequestInfo_IR_EventDef_event_get::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_EventDef_event_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -3185,18 +3142,18 @@ POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::~_TAO_EventDef_Strategized_Proxy
 
 IR::_TAO_EventDef_Proxy_Impl&
 POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::select_proxy (
-    ::IR::EventDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::IR::EventDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -3205,8 +3162,8 @@ POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -3276,8 +3233,8 @@ POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::_TAO_EventDef_ThruPOA_Proxy_Impl (void
 
 CORBA::Boolean POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::is_a (
     CORBA_Object *_collocated_tao_target_,
-    const char * event_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * event_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3292,8 +3249,8 @@ CORBA::Boolean POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::is_a (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "is_a",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -3302,14 +3259,14 @@ CORBA::Boolean POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::is_a (
           "IDL:omg.org/IR/EventDef:1.0"
         )
     )->is_a (
-        event_id,
-        ACE_TRY_ENV
+        event_id
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_ValueDef_ptr POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::event (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3324,8 +3281,8 @@ CORBA_ValueDef_ptr POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::event (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "event",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -3334,7 +3291,7 @@ CORBA_ValueDef_ptr POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::event (
           "IDL:omg.org/IR/EventDef:1.0"
         )
     )->event (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -3363,8 +3320,8 @@ POA_IR::EventDef::~EventDef (void)
 void POA_IR::EventDef::is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3392,20 +3349,20 @@ void POA_IR::EventDef::is_a_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      event_id.in (),
-      ACE_TRY_ENV
+      event_id.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_a (
-          event_id.in (),
-          ACE_TRY_ENV
+          event_id.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -3413,20 +3370,20 @@ void POA_IR::EventDef::is_a_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3448,16 +3405,13 @@ void POA_IR::EventDef::is_a_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::EventDef::_get_event_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::EventDef *_tao_impl =
@@ -3477,19 +3431,19 @@ void POA_IR::EventDef::_get_event_skel (
   TAO_ServerRequestInfo_IR_EventDef_event_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->event (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -3498,20 +3452,20 @@ void POA_IR::EventDef::_get_event_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3533,16 +3487,13 @@ void POA_IR::EventDef::_get_event_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::EventDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3552,7 +3503,7 @@ void POA_IR::EventDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -3564,12 +3515,12 @@ void POA_IR::EventDef::_is_a_skel (
 void POA_IR::EventDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::EventDef *_tao_impl = (POA_IR::EventDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -3581,8 +3532,8 @@ void POA_IR::EventDef::_non_existent_skel (
 void POA_IR::EventDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::EventDef *_tao_impl = (POA_IR::EventDef *) _tao_object_reference;
@@ -3601,7 +3552,7 @@ void POA_IR::EventDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -3627,11 +3578,11 @@ void POA_IR::EventDef::_interface_skel (
 }
 
 CORBA::Boolean POA_IR::EventDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -3659,12 +3610,12 @@ void* POA_IR::EventDef::_downcast (
   return 0;
 }
 
-void POA_IR::EventDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_IR::EventDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -3674,9 +3625,9 @@ const char* POA_IR::EventDef::_interface_repository_id (void) const
 }
 
 IR::EventDef*
-POA_IR::EventDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_IR::EventDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -3866,18 +3817,18 @@ POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::~_TAO_EmitsDef_Strategized_Proxy
 
 IR::_TAO_EmitsDef_Proxy_Impl&
 POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::select_proxy (
-    ::IR::EmitsDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::IR::EmitsDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -3886,8 +3837,8 @@ POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -3981,8 +3932,8 @@ POA_IR::EmitsDef::~EmitsDef (void)
 void POA_IR::EmitsDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3992,7 +3943,7 @@ void POA_IR::EmitsDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -4004,12 +3955,12 @@ void POA_IR::EmitsDef::_is_a_skel (
 void POA_IR::EmitsDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::EmitsDef *_tao_impl = (POA_IR::EmitsDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -4021,8 +3972,8 @@ void POA_IR::EmitsDef::_non_existent_skel (
 void POA_IR::EmitsDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::EmitsDef *_tao_impl = (POA_IR::EmitsDef *) _tao_object_reference;
@@ -4041,7 +3992,7 @@ void POA_IR::EmitsDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -4067,11 +4018,11 @@ void POA_IR::EmitsDef::_interface_skel (
 }
 
 CORBA::Boolean POA_IR::EmitsDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -4102,12 +4053,12 @@ void* POA_IR::EmitsDef::_downcast (
   return 0;
 }
 
-void POA_IR::EmitsDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_IR::EmitsDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -4117,9 +4068,9 @@ const char* POA_IR::EmitsDef::_interface_repository_id (void) const
 }
 
 IR::EmitsDef*
-POA_IR::EmitsDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_IR::EmitsDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -4309,18 +4260,18 @@ POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::~_TAO_PublishesDef_Strategiz
 
 IR::_TAO_PublishesDef_Proxy_Impl&
 POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::select_proxy (
-    ::IR::PublishesDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::IR::PublishesDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -4329,8 +4280,8 @@ POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -4424,8 +4375,8 @@ POA_IR::PublishesDef::~PublishesDef (void)
 void POA_IR::PublishesDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -4435,7 +4386,7 @@ void POA_IR::PublishesDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -4447,12 +4398,12 @@ void POA_IR::PublishesDef::_is_a_skel (
 void POA_IR::PublishesDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::PublishesDef *_tao_impl = (POA_IR::PublishesDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -4464,8 +4415,8 @@ void POA_IR::PublishesDef::_non_existent_skel (
 void POA_IR::PublishesDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::PublishesDef *_tao_impl = (POA_IR::PublishesDef *) _tao_object_reference;
@@ -4484,7 +4435,7 @@ void POA_IR::PublishesDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -4510,11 +4461,11 @@ void POA_IR::PublishesDef::_interface_skel (
 }
 
 CORBA::Boolean POA_IR::PublishesDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -4545,12 +4496,12 @@ void* POA_IR::PublishesDef::_downcast (
   return 0;
 }
 
-void POA_IR::PublishesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_IR::PublishesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -4560,9 +4511,9 @@ const char* POA_IR::PublishesDef::_interface_repository_id (void) const
 }
 
 IR::PublishesDef*
-POA_IR::PublishesDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_IR::PublishesDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -4752,18 +4703,18 @@ POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::~_TAO_ConsumesDef_Strategized
 
 IR::_TAO_ConsumesDef_Proxy_Impl&
 POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::select_proxy (
-    ::IR::ConsumesDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::IR::ConsumesDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -4772,8 +4723,8 @@ POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -4867,8 +4818,8 @@ POA_IR::ConsumesDef::~ConsumesDef (void)
 void POA_IR::ConsumesDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -4878,7 +4829,7 @@ void POA_IR::ConsumesDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -4890,12 +4841,12 @@ void POA_IR::ConsumesDef::_is_a_skel (
 void POA_IR::ConsumesDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ConsumesDef *_tao_impl = (POA_IR::ConsumesDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -4907,8 +4858,8 @@ void POA_IR::ConsumesDef::_non_existent_skel (
 void POA_IR::ConsumesDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ConsumesDef *_tao_impl = (POA_IR::ConsumesDef *) _tao_object_reference;
@@ -4927,7 +4878,7 @@ void POA_IR::ConsumesDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -4953,11 +4904,11 @@ void POA_IR::ConsumesDef::_interface_skel (
 }
 
 CORBA::Boolean POA_IR::ConsumesDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -4988,12 +4939,12 @@ void* POA_IR::ConsumesDef::_downcast (
   return 0;
 }
 
-void POA_IR::ConsumesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_IR::ConsumesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -5003,9 +4954,9 @@ const char* POA_IR::ConsumesDef::_interface_repository_id (void) const
 }
 
 IR::ConsumesDef*
-POA_IR::ConsumesDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_IR::ConsumesDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -5213,36 +5164,32 @@ public:
   TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_InterfaceDefSeq * result);
@@ -5259,45 +5206,45 @@ private:
 TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::ComponentDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::ComponentDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5309,7 +5256,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::result (CORBA::E
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5318,11 +5265,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::target_most_deri
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5339,36 +5286,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl
     ,
-    const CORBA_InterfaceDefSeq & supported_interfaces,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_InterfaceDefSeq & supported_interfaces
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -5386,8 +5329,8 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::TAO_ServerReques
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_IR::ComponentDef *tao_impl,
-    const CORBA_InterfaceDefSeq & supported_interfaces,
-    CORBA::Environment &
+    const CORBA_InterfaceDefSeq & supported_interfaces
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5395,12 +5338,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::TAO_ServerReques
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5416,25 +5359,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (CORBA
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -5442,7 +5385,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::result (CORBA::E
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5451,11 +5394,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::target_most_deri
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_IR_ComponentDef_base_component_get : public TAO_ServerRequestInfo
@@ -5464,36 +5407,32 @@ public:
   TAO_ServerRequestInfo_IR_ComponentDef_base_component_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::ComponentDef_ptr result);
@@ -5510,45 +5449,45 @@ private:
 TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::TAO_ServerRequestInfo_IR_ComponentDef_base_component_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::ComponentDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::ComponentDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5560,7 +5499,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::result (CORBA::Environ
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5569,11 +5508,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::target_most_derived_in
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5589,36 +5528,32 @@ public:
   TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::ProvidesDefSeq * result);
@@ -5635,45 +5570,45 @@ private:
 TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::ComponentDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::ComponentDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5685,7 +5620,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::result (CORBA::En
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5694,11 +5629,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::target_most_deriv
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5714,36 +5649,32 @@ public:
   TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::UsesDefSeq * result);
@@ -5760,45 +5691,45 @@ private:
 TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::ComponentDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::ComponentDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5810,7 +5741,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::result (CORBA::Enviro
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5819,11 +5750,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::target_most_derived_i
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5839,36 +5770,32 @@ public:
   TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::EmitsDefSeq * result);
@@ -5885,45 +5812,45 @@ private:
 TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::ComponentDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::ComponentDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5935,7 +5862,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::result (CORBA::Environme
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5944,11 +5871,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::target_most_derived_inte
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5964,36 +5891,32 @@ public:
   TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::PublishesDefSeq * result);
@@ -6010,45 +5933,45 @@ private:
 TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::ComponentDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::ComponentDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6060,7 +5983,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::result (CORBA::Envir
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6069,11 +5992,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::target_most_derived_
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6089,36 +6012,32 @@ public:
   TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::ConsumesDefSeq * result);
@@ -6135,45 +6054,45 @@ private:
 TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::ComponentDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::ComponentDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6185,7 +6104,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::result (CORBA::Enviro
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6194,11 +6113,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::target_most_derived_i
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6214,36 +6133,32 @@ public:
   TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -6260,45 +6175,45 @@ private:
 TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::ComponentDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::ComponentDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6310,7 +6225,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Environment &
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6319,11 +6234,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::target_most_derived_interfac
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6343,36 +6258,32 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    CORBA_InterfaceDef_ptr interface_type,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_InterfaceDef_ptr interface_type
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::ProvidesDef_ptr result);
@@ -6397,8 +6308,8 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::TAO_ServerRequestInfo_IR_
     const char * id,
     const char * name,
     const char * version,
-    CORBA_InterfaceDef_ptr interface_type,
-    CORBA::Environment &
+    CORBA_InterfaceDef_ptr interface_type
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6409,12 +6320,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::TAO_ServerRequestInfo_IR_
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_provides::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_provides::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6439,25 +6350,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_provides::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_provides::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_create_provides::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_provides::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6469,7 +6380,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_create_provides::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6478,11 +6389,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_create_provides::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6503,36 +6414,32 @@ public:
     const char * name,
     const char * version,
     CORBA_InterfaceDef_ptr interface_type,
-    const CORBA::Boolean & is_multiple,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::Boolean & is_multiple
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::UsesDef_ptr result);
@@ -6559,8 +6466,8 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::TAO_ServerRequestInfo_IR_Comp
     const char * name,
     const char * version,
     CORBA_InterfaceDef_ptr interface_type,
-    const CORBA::Boolean & is_multiple,
-    CORBA::Environment &
+    const CORBA::Boolean & is_multiple
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6572,12 +6479,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::TAO_ServerRequestInfo_IR_Comp
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_uses::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_uses::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6605,25 +6512,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_uses::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_uses::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_create_uses::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_uses::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6635,7 +6542,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_create_uses::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6644,11 +6551,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_create_uses::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6668,36 +6575,32 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr value,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_ValueDef_ptr value
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::EmitsDef_ptr result);
@@ -6722,8 +6625,8 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::TAO_ServerRequestInfo_IR_Com
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr value,
-    CORBA::Environment &
+    CORBA_ValueDef_ptr value
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6734,12 +6637,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::TAO_ServerRequestInfo_IR_Com
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_emits::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_emits::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6764,25 +6667,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::arguments (CORBA::Environmen
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_emits::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_emits::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_create_emits::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_emits::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6794,7 +6697,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::result (CORBA::Environment &
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_create_emits::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6803,11 +6706,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::target_most_derived_interfac
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_create_emits::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6827,36 +6730,32 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr value,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_ValueDef_ptr value
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::PublishesDef_ptr result);
@@ -6881,8 +6780,8 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::TAO_ServerRequestInfo_IR
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr value,
-    CORBA::Environment &
+    CORBA_ValueDef_ptr value
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6893,12 +6792,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::TAO_ServerRequestInfo_IR
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6923,25 +6822,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::arguments (CORBA::Enviro
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6953,7 +6852,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::result (CORBA::Environme
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6962,11 +6861,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::target_most_derived_inte
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6986,36 +6885,32 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr value,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_ValueDef_ptr value
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::ConsumesDef_ptr result);
@@ -7040,8 +6935,8 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::TAO_ServerRequestInfo_IR_
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr value,
-    CORBA::Environment &
+    CORBA_ValueDef_ptr value
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -7052,12 +6947,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::TAO_ServerRequestInfo_IR_
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -7082,25 +6977,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -7112,7 +7007,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -7121,11 +7016,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -7164,18 +7059,18 @@ POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::~_TAO_ComponentDef_Strategiz
 
 IR::_TAO_ComponentDef_Proxy_Impl&
 POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::select_proxy (
-    ::IR::ComponentDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::IR::ComponentDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -7184,8 +7079,8 @@ POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -7254,8 +7149,8 @@ POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_TAO_ComponentDef_ThruPOA_Proxy_Im
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA_InterfaceDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7270,8 +7165,8 @@ CORBA_InterfaceDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "supported_interfaces",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7280,14 +7175,14 @@ CORBA_InterfaceDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_
           "IDL:omg.org/IR/ComponentDef:1.0"
         )
     )->supported_interfaces (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA_InterfaceDefSeq & supported_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & supported_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7300,8 +7195,8 @@ void POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "supported_interfaces",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -7310,15 +7205,15 @@ void POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces (
           "IDL:omg.org/IR/ComponentDef:1.0"
         )
     )->supported_interfaces (
-        supported_interfaces,
-        ACE_TRY_ENV
+        supported_interfaces
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 IR::ComponentDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::base_component (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7333,8 +7228,8 @@ IR::ComponentDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::base_componen
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "base_component",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7343,13 +7238,13 @@ IR::ComponentDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::base_componen
           "IDL:omg.org/IR/ComponentDef:1.0"
         )
     )->base_component (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 IR::ProvidesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::provides_interfaces (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7364,8 +7259,8 @@ IR::ProvidesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::provides_inte
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "provides_interfaces",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7374,13 +7269,13 @@ IR::ProvidesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::provides_inte
           "IDL:omg.org/IR/ComponentDef:1.0"
         )
     )->provides_interfaces (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 IR::UsesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::uses_interfaces (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7395,8 +7290,8 @@ IR::UsesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::uses_interfaces (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "uses_interfaces",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7405,13 +7300,13 @@ IR::UsesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::uses_interfaces (
           "IDL:omg.org/IR/ComponentDef:1.0"
         )
     )->uses_interfaces (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 IR::EmitsDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::emits_events (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7426,8 +7321,8 @@ IR::EmitsDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::emits_events (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "emits_events",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7436,13 +7331,13 @@ IR::EmitsDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::emits_events (
           "IDL:omg.org/IR/ComponentDef:1.0"
         )
     )->emits_events (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 IR::PublishesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::publishes_events (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7457,8 +7352,8 @@ IR::PublishesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::publishes_ev
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "publishes_events",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7467,13 +7362,13 @@ IR::PublishesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::publishes_ev
           "IDL:omg.org/IR/ComponentDef:1.0"
         )
     )->publishes_events (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 IR::ConsumesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::consumes_events (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7488,8 +7383,8 @@ IR::ConsumesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::consumes_even
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "consumes_events",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7498,13 +7393,13 @@ IR::ConsumesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::consumes_even
           "IDL:omg.org/IR/ComponentDef:1.0"
         )
     )->consumes_events (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA::Boolean POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::is_basic (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7519,8 +7414,8 @@ CORBA::Boolean POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::is_basic (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "is_basic",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -7529,7 +7424,7 @@ CORBA::Boolean POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::is_basic (
           "IDL:omg.org/IR/ComponentDef:1.0"
         )
     )->is_basic (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -7538,8 +7433,8 @@ IR::ProvidesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_provide
     const char * id,
     const char * name,
     const char * version,
-    CORBA_InterfaceDef_ptr interface_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_InterfaceDef_ptr interface_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7554,8 +7449,8 @@ IR::ProvidesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_provide
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_provides",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7567,8 +7462,8 @@ IR::ProvidesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_provide
         id,
         name,
         version,
-        interface_type,
-        ACE_TRY_ENV
+        interface_type
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7578,8 +7473,8 @@ IR::UsesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_uses (
     const char * name,
     const char * version,
     CORBA_InterfaceDef_ptr interface_type,
-    CORBA::Boolean is_multiple,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean is_multiple
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7594,8 +7489,8 @@ IR::UsesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_uses (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_uses",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7608,8 +7503,8 @@ IR::UsesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_uses (
         name,
         version,
         interface_type,
-        is_multiple,
-        ACE_TRY_ENV
+        is_multiple
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7618,8 +7513,8 @@ IR::EmitsDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_emits (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr value,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_ValueDef_ptr value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7634,8 +7529,8 @@ IR::EmitsDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_emits (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_emits",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7647,8 +7542,8 @@ IR::EmitsDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_emits (
         id,
         name,
         version,
-        value,
-        ACE_TRY_ENV
+        value
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7657,8 +7552,8 @@ IR::PublishesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_publis
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr value,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_ValueDef_ptr value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7673,8 +7568,8 @@ IR::PublishesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_publis
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_publishes",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7686,8 +7581,8 @@ IR::PublishesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_publis
         id,
         name,
         version,
-        value,
-        ACE_TRY_ENV
+        value
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7696,8 +7591,8 @@ IR::ConsumesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_consume
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr value,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_ValueDef_ptr value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7712,8 +7607,8 @@ IR::ConsumesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_consume
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_consumes",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7725,8 +7620,8 @@ IR::ConsumesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_consume
         id,
         name,
         version,
-        value,
-        ACE_TRY_ENV
+        value
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7758,8 +7653,8 @@ POA_IR::ComponentDef::~ComponentDef (void)
 void POA_IR::ComponentDef::_get_supported_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl =
@@ -7779,19 +7674,19 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel (
   TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->supported_interfaces (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7800,20 +7695,20 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7835,16 +7730,13 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::_set_supported_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7872,39 +7764,39 @@ void POA_IR::ComponentDef::_set_supported_interfaces_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      supported_interfaces,
-      ACE_TRY_ENV
+      supported_interfaces
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->supported_interfaces (
-          supported_interfaces,
-          ACE_TRY_ENV
+          supported_interfaces
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7919,16 +7811,13 @@ void POA_IR::ComponentDef::_set_supported_interfaces_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::_get_base_component_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl =
@@ -7948,19 +7837,19 @@ void POA_IR::ComponentDef::_get_base_component_skel (
   TAO_ServerRequestInfo_IR_ComponentDef_base_component_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->base_component (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7969,20 +7858,20 @@ void POA_IR::ComponentDef::_get_base_component_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8004,16 +7893,13 @@ void POA_IR::ComponentDef::_get_base_component_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::_get_provides_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl =
@@ -8033,19 +7919,19 @@ void POA_IR::ComponentDef::_get_provides_interfaces_skel (
   TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->provides_interfaces (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8054,20 +7940,20 @@ void POA_IR::ComponentDef::_get_provides_interfaces_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8089,16 +7975,13 @@ void POA_IR::ComponentDef::_get_provides_interfaces_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::_get_uses_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl =
@@ -8118,19 +8001,19 @@ void POA_IR::ComponentDef::_get_uses_interfaces_skel (
   TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->uses_interfaces (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8139,20 +8022,20 @@ void POA_IR::ComponentDef::_get_uses_interfaces_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8174,16 +8057,13 @@ void POA_IR::ComponentDef::_get_uses_interfaces_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::_get_emits_events_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl =
@@ -8203,19 +8083,19 @@ void POA_IR::ComponentDef::_get_emits_events_skel (
   TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->emits_events (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8224,20 +8104,20 @@ void POA_IR::ComponentDef::_get_emits_events_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8259,16 +8139,13 @@ void POA_IR::ComponentDef::_get_emits_events_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::_get_publishes_events_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl =
@@ -8288,19 +8165,19 @@ void POA_IR::ComponentDef::_get_publishes_events_skel (
   TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->publishes_events (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8309,20 +8186,20 @@ void POA_IR::ComponentDef::_get_publishes_events_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8344,16 +8221,13 @@ void POA_IR::ComponentDef::_get_publishes_events_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::_get_consumes_events_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl =
@@ -8373,19 +8247,19 @@ void POA_IR::ComponentDef::_get_consumes_events_skel (
   TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->consumes_events (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8394,20 +8268,20 @@ void POA_IR::ComponentDef::_get_consumes_events_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8429,16 +8303,13 @@ void POA_IR::ComponentDef::_get_consumes_events_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::_get_is_basic_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl =
@@ -8458,19 +8329,19 @@ void POA_IR::ComponentDef::_get_is_basic_skel (
   TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_basic (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8478,20 +8349,20 @@ void POA_IR::ComponentDef::_get_is_basic_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8513,16 +8384,13 @@ void POA_IR::ComponentDef::_get_is_basic_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::create_provides_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8559,13 +8427,13 @@ void POA_IR::ComponentDef::create_provides_skel (
       id.in (),
       name.in (),
       version.in (),
-      interface_type.in (),
-      ACE_TRY_ENV
+      interface_type.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8574,8 +8442,8 @@ void POA_IR::ComponentDef::create_provides_skel (
           id.in (),
           name.in (),
           version.in (),
-          interface_type.in (),
-          ACE_TRY_ENV
+          interface_type.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8584,20 +8452,20 @@ void POA_IR::ComponentDef::create_provides_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8619,16 +8487,13 @@ void POA_IR::ComponentDef::create_provides_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::create_uses_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8668,13 +8533,13 @@ void POA_IR::ComponentDef::create_uses_skel (
       name.in (),
       version.in (),
       interface_type.in (),
-      is_multiple,
-      ACE_TRY_ENV
+      is_multiple
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8684,8 +8549,8 @@ void POA_IR::ComponentDef::create_uses_skel (
           name.in (),
           version.in (),
           interface_type.in (),
-          is_multiple,
-          ACE_TRY_ENV
+          is_multiple
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8694,20 +8559,20 @@ void POA_IR::ComponentDef::create_uses_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8729,16 +8594,13 @@ void POA_IR::ComponentDef::create_uses_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::create_emits_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8775,13 +8637,13 @@ void POA_IR::ComponentDef::create_emits_skel (
       id.in (),
       name.in (),
       version.in (),
-      value.in (),
-      ACE_TRY_ENV
+      value.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8790,8 +8652,8 @@ void POA_IR::ComponentDef::create_emits_skel (
           id.in (),
           name.in (),
           version.in (),
-          value.in (),
-          ACE_TRY_ENV
+          value.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8800,20 +8662,20 @@ void POA_IR::ComponentDef::create_emits_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8835,16 +8697,13 @@ void POA_IR::ComponentDef::create_emits_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::create_publishes_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8881,13 +8740,13 @@ void POA_IR::ComponentDef::create_publishes_skel (
       id.in (),
       name.in (),
       version.in (),
-      value.in (),
-      ACE_TRY_ENV
+      value.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8896,8 +8755,8 @@ void POA_IR::ComponentDef::create_publishes_skel (
           id.in (),
           name.in (),
           version.in (),
-          value.in (),
-          ACE_TRY_ENV
+          value.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8906,20 +8765,20 @@ void POA_IR::ComponentDef::create_publishes_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8941,16 +8800,13 @@ void POA_IR::ComponentDef::create_publishes_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::create_consumes_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8987,13 +8843,13 @@ void POA_IR::ComponentDef::create_consumes_skel (
       id.in (),
       name.in (),
       version.in (),
-      value.in (),
-      ACE_TRY_ENV
+      value.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -9002,8 +8858,8 @@ void POA_IR::ComponentDef::create_consumes_skel (
           id.in (),
           name.in (),
           version.in (),
-          value.in (),
-          ACE_TRY_ENV
+          value.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -9012,20 +8868,20 @@ void POA_IR::ComponentDef::create_consumes_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9047,16 +8903,13 @@ void POA_IR::ComponentDef::create_consumes_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9066,7 +8919,7 @@ void POA_IR::ComponentDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9078,12 +8931,12 @@ void POA_IR::ComponentDef::_is_a_skel (
 void POA_IR::ComponentDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9095,8 +8948,8 @@ void POA_IR::ComponentDef::_non_existent_skel (
 void POA_IR::ComponentDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *) _tao_object_reference;
@@ -9115,7 +8968,7 @@ void POA_IR::ComponentDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -9141,11 +8994,11 @@ void POA_IR::ComponentDef::_interface_skel (
 }
 
 CORBA::Boolean POA_IR::ComponentDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -9182,12 +9035,12 @@ void* POA_IR::ComponentDef::_downcast (
   return 0;
 }
 
-void POA_IR::ComponentDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_IR::ComponentDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -9197,9 +9050,9 @@ const char* POA_IR::ComponentDef::_interface_repository_id (void) const
 }
 
 IR::ComponentDef*
-POA_IR::ComponentDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_IR::ComponentDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -9367,36 +9220,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::PrimaryKeyDef *tao_impl
     ,
-    const char * primary_key_id,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * primary_key_id
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -9415,8 +9264,8 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::TAO_ServerRequestInfo_IR_PrimaryKey
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_IR::PrimaryKeyDef *tao_impl,
-    const char * primary_key_id,
-    CORBA::Environment &
+    const char * primary_key_id
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -9424,12 +9273,12 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::TAO_ServerRequestInfo_IR_PrimaryKey
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -9445,25 +9294,25 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::arguments (CORBA::Environment &ACE_
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -9475,7 +9324,7 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::result (CORBA::Environment &ACE_TRY
 
 char *
 TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -9484,11 +9333,11 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -9504,36 +9353,32 @@ public:
   TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::PrimaryKeyDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ValueDef_ptr result);
@@ -9550,45 +9395,45 @@ private:
 TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::PrimaryKeyDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::PrimaryKeyDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -9600,7 +9445,7 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (CORBA::Environme
 
 char *
 TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -9609,11 +9454,11 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::target_most_derived_inte
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -9652,18 +9497,18 @@ POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::~_TAO_PrimaryKeyDef_Strateg
 
 IR::_TAO_PrimaryKeyDef_Proxy_Impl&
 POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::select_proxy (
-    ::IR::PrimaryKeyDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::IR::PrimaryKeyDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -9672,8 +9517,8 @@ POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -9743,8 +9588,8 @@ POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::_TAO_PrimaryKeyDef_ThruPOA_Proxy_
 
 CORBA::Boolean POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::is_a (
     CORBA_Object *_collocated_tao_target_,
-    const char * primary_key_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * primary_key_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -9759,8 +9604,8 @@ CORBA::Boolean POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::is_a (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "is_a",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -9769,14 +9614,14 @@ CORBA::Boolean POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::is_a (
           "IDL:omg.org/IR/PrimaryKeyDef:1.0"
         )
     )->is_a (
-        primary_key_id,
-        ACE_TRY_ENV
+        primary_key_id
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_ValueDef_ptr POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::primary_key (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -9791,8 +9636,8 @@ CORBA_ValueDef_ptr POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::primary_key (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "primary_key",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -9801,7 +9646,7 @@ CORBA_ValueDef_ptr POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::primary_key (
           "IDL:omg.org/IR/PrimaryKeyDef:1.0"
         )
     )->primary_key (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -9830,8 +9675,8 @@ POA_IR::PrimaryKeyDef::~PrimaryKeyDef (void)
 void POA_IR::PrimaryKeyDef::is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9859,20 +9704,20 @@ void POA_IR::PrimaryKeyDef::is_a_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      primary_key_id.in (),
-      ACE_TRY_ENV
+      primary_key_id.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_a (
-          primary_key_id.in (),
-          ACE_TRY_ENV
+          primary_key_id.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -9880,20 +9725,20 @@ void POA_IR::PrimaryKeyDef::is_a_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9915,16 +9760,13 @@ void POA_IR::PrimaryKeyDef::is_a_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::PrimaryKeyDef::_get_primary_key_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::PrimaryKeyDef *_tao_impl =
@@ -9944,19 +9786,19 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel (
   TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->primary_key (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -9965,20 +9807,20 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -10000,16 +9842,13 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::PrimaryKeyDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -10019,7 +9858,7 @@ void POA_IR::PrimaryKeyDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10031,12 +9870,12 @@ void POA_IR::PrimaryKeyDef::_is_a_skel (
 void POA_IR::PrimaryKeyDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::PrimaryKeyDef *_tao_impl = (POA_IR::PrimaryKeyDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10048,8 +9887,8 @@ void POA_IR::PrimaryKeyDef::_non_existent_skel (
 void POA_IR::PrimaryKeyDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::PrimaryKeyDef *_tao_impl = (POA_IR::PrimaryKeyDef *) _tao_object_reference;
@@ -10068,7 +9907,7 @@ void POA_IR::PrimaryKeyDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -10094,11 +9933,11 @@ void POA_IR::PrimaryKeyDef::_interface_skel (
 }
 
 CORBA::Boolean POA_IR::PrimaryKeyDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -10126,12 +9965,12 @@ void* POA_IR::PrimaryKeyDef::_downcast (
   return 0;
 }
 
-void POA_IR::PrimaryKeyDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_IR::PrimaryKeyDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -10141,9 +9980,9 @@ const char* POA_IR::PrimaryKeyDef::_interface_repository_id (void) const
 }
 
 IR::PrimaryKeyDef*
-POA_IR::PrimaryKeyDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_IR::PrimaryKeyDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -10393,18 +10232,18 @@ POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::~_TAO_FactoryDef_Strategized_P
 
 IR::_TAO_FactoryDef_Proxy_Impl&
 POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::select_proxy (
-    ::IR::FactoryDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::IR::FactoryDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -10413,8 +10252,8 @@ POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -10508,8 +10347,8 @@ POA_IR::FactoryDef::~FactoryDef (void)
 void POA_IR::FactoryDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -10519,7 +10358,7 @@ void POA_IR::FactoryDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10531,12 +10370,12 @@ void POA_IR::FactoryDef::_is_a_skel (
 void POA_IR::FactoryDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::FactoryDef *_tao_impl = (POA_IR::FactoryDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10548,8 +10387,8 @@ void POA_IR::FactoryDef::_non_existent_skel (
 void POA_IR::FactoryDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::FactoryDef *_tao_impl = (POA_IR::FactoryDef *) _tao_object_reference;
@@ -10568,7 +10407,7 @@ void POA_IR::FactoryDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -10594,11 +10433,11 @@ void POA_IR::FactoryDef::_interface_skel (
 }
 
 CORBA::Boolean POA_IR::FactoryDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -10629,12 +10468,12 @@ void* POA_IR::FactoryDef::_downcast (
   return 0;
 }
 
-void POA_IR::FactoryDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_IR::FactoryDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -10644,9 +10483,9 @@ const char* POA_IR::FactoryDef::_interface_repository_id (void) const
 }
 
 IR::FactoryDef*
-POA_IR::FactoryDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_IR::FactoryDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -10896,18 +10735,18 @@ POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::~_TAO_FinderDef_Strategized_Pro
 
 IR::_TAO_FinderDef_Proxy_Impl&
 POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::select_proxy (
-    ::IR::FinderDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::IR::FinderDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -10916,8 +10755,8 @@ POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -11011,8 +10850,8 @@ POA_IR::FinderDef::~FinderDef (void)
 void POA_IR::FinderDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -11022,7 +10861,7 @@ void POA_IR::FinderDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -11034,12 +10873,12 @@ void POA_IR::FinderDef::_is_a_skel (
 void POA_IR::FinderDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::FinderDef *_tao_impl = (POA_IR::FinderDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -11051,8 +10890,8 @@ void POA_IR::FinderDef::_non_existent_skel (
 void POA_IR::FinderDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::FinderDef *_tao_impl = (POA_IR::FinderDef *) _tao_object_reference;
@@ -11071,7 +10910,7 @@ void POA_IR::FinderDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -11097,11 +10936,11 @@ void POA_IR::FinderDef::_interface_skel (
 }
 
 CORBA::Boolean POA_IR::FinderDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -11132,12 +10971,12 @@ void* POA_IR::FinderDef::_downcast (
   return 0;
 }
 
-void POA_IR::FinderDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_IR::FinderDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -11147,9 +10986,9 @@ const char* POA_IR::FinderDef::_interface_repository_id (void) const
 }
 
 IR::FinderDef*
-POA_IR::FinderDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_IR::FinderDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -11351,36 +11190,32 @@ public:
   TAO_ServerRequestInfo_IR_HomeDef_base_home_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::HomeDef_ptr result);
@@ -11397,45 +11232,45 @@ private:
 TAO_ServerRequestInfo_IR_HomeDef_base_home_get::TAO_ServerRequestInfo_IR_HomeDef_base_home_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::HomeDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::HomeDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_HomeDef_base_home_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_base_home_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_HomeDef_base_home_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_base_home_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_HomeDef_base_home_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_base_home_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -11447,7 +11282,7 @@ TAO_ServerRequestInfo_IR_HomeDef_base_home_get::result (CORBA::Environment &ACE_
 
 char *
 TAO_ServerRequestInfo_IR_HomeDef_base_home_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -11456,11 +11291,11 @@ TAO_ServerRequestInfo_IR_HomeDef_base_home_get::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_HomeDef_base_home_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -11476,36 +11311,32 @@ public:
   TAO_ServerRequestInfo_IR_HomeDef_managed_component_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::ComponentDef_ptr result);
@@ -11522,45 +11353,45 @@ private:
 TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::TAO_ServerRequestInfo_IR_HomeDef_managed_component_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::HomeDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::HomeDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -11572,7 +11403,7 @@ TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::result (CORBA::Environme
 
 char *
 TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -11581,11 +11412,11 @@ TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::target_most_derived_inte
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -11601,36 +11432,32 @@ public:
   TAO_ServerRequestInfo_IR_HomeDef_primary_key_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::PrimaryKeyDef_ptr result);
@@ -11647,45 +11474,45 @@ private:
 TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::TAO_ServerRequestInfo_IR_HomeDef_primary_key_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::HomeDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::HomeDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -11697,7 +11524,7 @@ TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::result (CORBA::Environment &AC
 
 char *
 TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -11706,11 +11533,11 @@ TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -11726,36 +11553,32 @@ public:
   TAO_ServerRequestInfo_IR_HomeDef_factories_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::FactoryDefSeq * result);
@@ -11772,45 +11595,45 @@ private:
 TAO_ServerRequestInfo_IR_HomeDef_factories_get::TAO_ServerRequestInfo_IR_HomeDef_factories_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::HomeDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::HomeDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_HomeDef_factories_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_factories_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_HomeDef_factories_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_factories_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_HomeDef_factories_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_factories_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -11822,7 +11645,7 @@ TAO_ServerRequestInfo_IR_HomeDef_factories_get::result (CORBA::Environment &ACE_
 
 char *
 TAO_ServerRequestInfo_IR_HomeDef_factories_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -11831,11 +11654,11 @@ TAO_ServerRequestInfo_IR_HomeDef_factories_get::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_HomeDef_factories_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -11851,36 +11674,32 @@ public:
   TAO_ServerRequestInfo_IR_HomeDef_finders_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::FinderDefSeq * result);
@@ -11897,45 +11716,45 @@ private:
 TAO_ServerRequestInfo_IR_HomeDef_finders_get::TAO_ServerRequestInfo_IR_HomeDef_finders_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::HomeDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::HomeDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_HomeDef_finders_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_finders_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_HomeDef_finders_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_finders_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_HomeDef_finders_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_finders_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -11947,7 +11766,7 @@ TAO_ServerRequestInfo_IR_HomeDef_finders_get::result (CORBA::Environment &ACE_TR
 
 char *
 TAO_ServerRequestInfo_IR_HomeDef_finders_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -11956,11 +11775,11 @@ TAO_ServerRequestInfo_IR_HomeDef_finders_get::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_HomeDef_finders_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -11976,36 +11795,32 @@ public:
   TAO_ServerRequestInfo_IR_HomeDef_is_basic_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -12022,45 +11837,45 @@ private:
 TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::TAO_ServerRequestInfo_IR_HomeDef_is_basic_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::HomeDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::HomeDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -12072,7 +11887,7 @@ TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::Environment &ACE_T
 
 char *
 TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -12081,11 +11896,11 @@ TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -12105,36 +11920,32 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr primary_key,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_ValueDef_ptr primary_key
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::PrimaryKeyDef_ptr result);
@@ -12159,8 +11970,8 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::TAO_ServerRequestInfo_IR_Ho
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr primary_key,
-    CORBA::Environment &
+    CORBA_ValueDef_ptr primary_key
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -12171,12 +11982,12 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::TAO_ServerRequestInfo_IR_Ho
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -12201,25 +12012,25 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::arguments (CORBA::Environme
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -12231,7 +12042,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -12240,11 +12051,11 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::target_most_derived_interfa
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -12265,36 +12076,32 @@ public:
     const char * name,
     const char * version,
     const CORBA_ParDescriptionSeq & params,
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::FactoryDef_ptr result);
@@ -12321,8 +12128,8 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::TAO_ServerRequestInfo_IR_HomeDe
     const char * name,
     const char * version,
     const CORBA_ParDescriptionSeq & params,
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -12334,12 +12141,12 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::TAO_ServerRequestInfo_IR_HomeDe
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_HomeDef_create_factory::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_create_factory::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -12367,25 +12174,25 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::arguments (CORBA::Environment &
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_HomeDef_create_factory::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_create_factory::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_HomeDef_create_factory::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_create_factory::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -12397,7 +12204,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::result (CORBA::Environment &ACE
 
 char *
 TAO_ServerRequestInfo_IR_HomeDef_create_factory::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -12406,11 +12213,11 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_HomeDef_create_factory::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -12431,36 +12238,32 @@ public:
     const char * name,
     const char * version,
     const CORBA_ParDescriptionSeq & params,
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::FinderDef_ptr result);
@@ -12487,8 +12290,8 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::TAO_ServerRequestInfo_IR_HomeDef
     const char * name,
     const char * version,
     const CORBA_ParDescriptionSeq & params,
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -12500,12 +12303,12 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::TAO_ServerRequestInfo_IR_HomeDef
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_HomeDef_create_finder::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_create_finder::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -12533,25 +12336,25 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::arguments (CORBA::Environment &A
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_HomeDef_create_finder::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_create_finder::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_HomeDef_create_finder::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_create_finder::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -12563,7 +12366,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::result (CORBA::Environment &ACE_
 
 char *
 TAO_ServerRequestInfo_IR_HomeDef_create_finder::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -12572,11 +12375,11 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_HomeDef_create_finder::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -12615,18 +12418,18 @@ POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::~_TAO_HomeDef_Strategized_Proxy_B
 
 IR::_TAO_HomeDef_Proxy_Impl&
 POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::select_proxy (
-    ::IR::HomeDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::IR::HomeDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -12635,8 +12438,8 @@ POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -12705,8 +12508,8 @@ POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_TAO_HomeDef_ThruPOA_Proxy_Impl (void)
 // ThruPOA Implementation of the IDL interface methods
 
 IR::HomeDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::base_home (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12721,8 +12524,8 @@ IR::HomeDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::base_home (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "base_home",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -12731,13 +12534,13 @@ IR::HomeDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::base_home (
           "IDL:omg.org/IR/HomeDef:1.0"
         )
     )->base_home (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 IR::ComponentDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::managed_component (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12752,8 +12555,8 @@ IR::ComponentDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::managed_component
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "managed_component",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -12762,13 +12565,13 @@ IR::ComponentDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::managed_component
           "IDL:omg.org/IR/HomeDef:1.0"
         )
     )->managed_component (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::primary_key (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12783,8 +12586,8 @@ IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::primary_key (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "primary_key",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -12793,13 +12596,13 @@ IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::primary_key (
           "IDL:omg.org/IR/HomeDef:1.0"
         )
     )->primary_key (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 IR::FactoryDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::factories (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12814,8 +12617,8 @@ IR::FactoryDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::factories (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "factories",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -12824,13 +12627,13 @@ IR::FactoryDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::factories (
           "IDL:omg.org/IR/HomeDef:1.0"
         )
     )->factories (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 IR::FinderDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::finders (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12845,8 +12648,8 @@ IR::FinderDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::finders (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "finders",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -12855,13 +12658,13 @@ IR::FinderDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::finders (
           "IDL:omg.org/IR/HomeDef:1.0"
         )
     )->finders (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA::Boolean POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::is_basic (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12876,8 +12679,8 @@ CORBA::Boolean POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::is_basic (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "is_basic",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -12886,7 +12689,7 @@ CORBA::Boolean POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::is_basic (
           "IDL:omg.org/IR/HomeDef:1.0"
         )
     )->is_basic (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -12895,8 +12698,8 @@ IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_primary_ke
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr primary_key,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_ValueDef_ptr primary_key
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12911,8 +12714,8 @@ IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_primary_ke
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_primary_key",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -12924,8 +12727,8 @@ IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_primary_ke
         id,
         name,
         version,
-        primary_key,
-        ACE_TRY_ENV
+        primary_key
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -12935,8 +12738,8 @@ IR::FactoryDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_factory (
     const char * name,
     const char * version,
     const CORBA_ParDescriptionSeq & params,
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12951,8 +12754,8 @@ IR::FactoryDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_factory (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_factory",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -12965,8 +12768,8 @@ IR::FactoryDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_factory (
         name,
         version,
         params,
-        exceptions,
-        ACE_TRY_ENV
+        exceptions
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -12976,8 +12779,8 @@ IR::FinderDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_finder (
     const char * name,
     const char * version,
     const CORBA_ParDescriptionSeq & params,
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12992,8 +12795,8 @@ IR::FinderDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_finder (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_finder",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -13006,8 +12809,8 @@ IR::FinderDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_finder (
         name,
         version,
         params,
-        exceptions,
-        ACE_TRY_ENV
+        exceptions
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -13039,8 +12842,8 @@ POA_IR::HomeDef::~HomeDef (void)
 void POA_IR::HomeDef::_get_base_home_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::HomeDef *_tao_impl =
@@ -13060,19 +12863,19 @@ void POA_IR::HomeDef::_get_base_home_skel (
   TAO_ServerRequestInfo_IR_HomeDef_base_home_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->base_home (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13081,20 +12884,20 @@ void POA_IR::HomeDef::_get_base_home_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13116,16 +12919,13 @@ void POA_IR::HomeDef::_get_base_home_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::HomeDef::_get_managed_component_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::HomeDef *_tao_impl =
@@ -13145,19 +12945,19 @@ void POA_IR::HomeDef::_get_managed_component_skel (
   TAO_ServerRequestInfo_IR_HomeDef_managed_component_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->managed_component (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13166,20 +12966,20 @@ void POA_IR::HomeDef::_get_managed_component_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13201,16 +13001,13 @@ void POA_IR::HomeDef::_get_managed_component_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::HomeDef::_get_primary_key_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::HomeDef *_tao_impl =
@@ -13230,19 +13027,19 @@ void POA_IR::HomeDef::_get_primary_key_skel (
   TAO_ServerRequestInfo_IR_HomeDef_primary_key_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->primary_key (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13251,20 +13048,20 @@ void POA_IR::HomeDef::_get_primary_key_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13286,16 +13083,13 @@ void POA_IR::HomeDef::_get_primary_key_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::HomeDef::_get_factories_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::HomeDef *_tao_impl =
@@ -13315,19 +13109,19 @@ void POA_IR::HomeDef::_get_factories_skel (
   TAO_ServerRequestInfo_IR_HomeDef_factories_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->factories (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13336,20 +13130,20 @@ void POA_IR::HomeDef::_get_factories_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13371,16 +13165,13 @@ void POA_IR::HomeDef::_get_factories_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::HomeDef::_get_finders_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::HomeDef *_tao_impl =
@@ -13400,19 +13191,19 @@ void POA_IR::HomeDef::_get_finders_skel (
   TAO_ServerRequestInfo_IR_HomeDef_finders_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->finders (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13421,20 +13212,20 @@ void POA_IR::HomeDef::_get_finders_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13456,16 +13247,13 @@ void POA_IR::HomeDef::_get_finders_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::HomeDef::_get_is_basic_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::HomeDef *_tao_impl =
@@ -13485,19 +13273,19 @@ void POA_IR::HomeDef::_get_is_basic_skel (
   TAO_ServerRequestInfo_IR_HomeDef_is_basic_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_basic (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13505,20 +13293,20 @@ void POA_IR::HomeDef::_get_is_basic_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13540,16 +13328,13 @@ void POA_IR::HomeDef::_get_is_basic_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::HomeDef::create_primary_key_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -13586,13 +13371,13 @@ void POA_IR::HomeDef::create_primary_key_skel (
       id.in (),
       name.in (),
       version.in (),
-      primary_key.in (),
-      ACE_TRY_ENV
+      primary_key.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -13601,8 +13386,8 @@ void POA_IR::HomeDef::create_primary_key_skel (
           id.in (),
           name.in (),
           version.in (),
-          primary_key.in (),
-          ACE_TRY_ENV
+          primary_key.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13611,20 +13396,20 @@ void POA_IR::HomeDef::create_primary_key_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13646,16 +13431,13 @@ void POA_IR::HomeDef::create_primary_key_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::HomeDef::create_factory_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -13695,13 +13477,13 @@ void POA_IR::HomeDef::create_factory_skel (
       name.in (),
       version.in (),
       params,
-      exceptions,
-      ACE_TRY_ENV
+      exceptions
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -13711,8 +13493,8 @@ void POA_IR::HomeDef::create_factory_skel (
           name.in (),
           version.in (),
           params,
-          exceptions,
-          ACE_TRY_ENV
+          exceptions
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13721,20 +13503,20 @@ void POA_IR::HomeDef::create_factory_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13756,16 +13538,13 @@ void POA_IR::HomeDef::create_factory_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::HomeDef::create_finder_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -13805,13 +13584,13 @@ void POA_IR::HomeDef::create_finder_skel (
       name.in (),
       version.in (),
       params,
-      exceptions,
-      ACE_TRY_ENV
+      exceptions
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -13821,8 +13600,8 @@ void POA_IR::HomeDef::create_finder_skel (
           name.in (),
           version.in (),
           params,
-          exceptions,
-          ACE_TRY_ENV
+          exceptions
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13831,20 +13610,20 @@ void POA_IR::HomeDef::create_finder_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13866,16 +13645,13 @@ void POA_IR::HomeDef::create_finder_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::HomeDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -13885,7 +13661,7 @@ void POA_IR::HomeDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -13897,12 +13673,12 @@ void POA_IR::HomeDef::_is_a_skel (
 void POA_IR::HomeDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -13914,8 +13690,8 @@ void POA_IR::HomeDef::_non_existent_skel (
 void POA_IR::HomeDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *) _tao_object_reference;
@@ -13934,7 +13710,7 @@ void POA_IR::HomeDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -13960,11 +13736,11 @@ void POA_IR::HomeDef::_interface_skel (
 }
 
 CORBA::Boolean POA_IR::HomeDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -14001,12 +13777,12 @@ void* POA_IR::HomeDef::_downcast (
   return 0;
 }
 
-void POA_IR::HomeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_IR::HomeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -14016,9 +13792,9 @@ const char* POA_IR::HomeDef::_interface_repository_id (void) const
 }
 
 IR::HomeDef*
-POA_IR::HomeDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_IR::HomeDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h
index e77ec38042c..ce0d7b2a01a 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h
@@ -54,7 +54,7 @@ TAO_NAMESPACE  POA_IR
   // Forward Classes Declaration
   class _TAO_ComponentRepository_ThruPOA_Proxy_Impl;
   class _TAO_ComponentRepository_Strategized_Proxy_Broker;
-  
+
   class  ComponentRepository : public virtual POA_CORBA_Repository
   {
   protected:
@@ -66,10 +66,9 @@ TAO_NAMESPACE  POA_IR
 
 
     virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        const char* logical_type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual void* _downcast (
         const char* logical_type_id
@@ -78,34 +77,33 @@ TAO_NAMESPACE  POA_IR
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
-        void *_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     ::IR::ComponentRepository *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual const char* _interface_repository_id (void) const;
 
@@ -114,19 +112,18 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         IR::ComponentDef_ptr base_component,
-        const CORBA_InterfaceDefSeq & supports_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InterfaceDefSeq & supports_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void create_component_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::HomeDef_ptr create_home (
@@ -135,317 +132,289 @@ TAO_NAMESPACE  POA_IR
         const char * version,
         IR::HomeDef_ptr base_home,
         IR::ComponentDef_ptr managed_component,
-        CORBA_ValueDef_ptr primary_key,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_ValueDef_ptr primary_key
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void create_home_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void lookup_id_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void get_canonical_typecode_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void get_primitive_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_string_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_wstring_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_sequence_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_array_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_fixed_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void lookup_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void contents_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void lookup_name_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_contents_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_module_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_constant_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_struct_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_union_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_enum_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_alias_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_interface_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_value_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_value_box_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_exception_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_native_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_abstract_interface_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_local_interface_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void destroy_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
   };
 
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   class  _TAO_ComponentRepository_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ComponentRepository_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_ComponentRepository_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_ComponentRepository_Strategized_Proxy_Broker (void);
-    
+
     virtual ::IR::_TAO_ComponentRepository_Proxy_Impl &select_proxy (
-      ::IR::ComponentRepository *object,
-      CORBA_Environment &ACE_TRY_ENV
+      ::IR::ComponentRepository *object
+      TAO_ENV_ARG_DECL
     );
-  
+
   private:
-  
+
     // Helper methods that takes care to create the proxy
     // as soon as their use is necessary.
     void create_proxy (
-      int collocation_strategy,
-      CORBA::Environment &ACE_TRY_ENV
+      int collocation_strategy
+      TAO_ENV_ARG_DECL
     );
-    
+
   private:
-    
+
     // Caches the proxy implementations. The proxy implementation
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::IR::_TAO_ComponentRepository_Proxy_Impl
     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-    
+
     TAO_SYNCH_MUTEX mutex_;
     // This funxtion is used to get an handle to the unique instance
     // of the Strategized Proxy Broker that is available for a given
     // interface.
-  
+
   public:
     static _TAO_ComponentRepository_Strategized_Proxy_Broker *the_TAO_ComponentRepository_Strategized_Proxy_Broker (void);
   };
-  
-  
+
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-  
-  class  _TAO_ComponentRepository_ThruPOA_Proxy_Impl : 
+
+  class  _TAO_ComponentRepository_ThruPOA_Proxy_Impl :
     public virtual ::IR::_TAO_ComponentRepository_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::_TAO_CORBA_Repository_ThruPOA_Proxy_Impl
-    
+
   {
   public:
     _TAO_ComponentRepository_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_ComponentRepository_ThruPOA_Proxy_Impl (void) { }
-    
+
     virtual IR::ComponentDef_ptr create_component (
         CORBA_Object *_collocated_tao_target_,
         const char * id,
         const char * name,
         const char * version,
         IR::ComponentDef_ptr base_component,
-        const CORBA_InterfaceDefSeq & supports_interfaces,
-        CORBA::Environment &ACE_TRY_ENV
+        const CORBA_InterfaceDefSeq & supports_interfaces
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::HomeDef_ptr create_home (
         CORBA_Object *_collocated_tao_target_,
         const char * id,
@@ -453,27 +422,27 @@ TAO_NAMESPACE  POA_IR
         const char * version,
         IR::HomeDef_ptr base_home,
         IR::ComponentDef_ptr managed_component,
-        CORBA_ValueDef_ptr primary_key,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_ValueDef_ptr primary_key
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-    
+
+
   };
-  
+
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   class ProvidesDef;
   typedef ProvidesDef *ProvidesDef_ptr;
   // Forward Classes Declaration
   class _TAO_ProvidesDef_ThruPOA_Proxy_Impl;
   class _TAO_ProvidesDef_Strategized_Proxy_Broker;
-  
+
   class  ProvidesDef : public virtual POA_CORBA_Contained
   {
   protected:
@@ -485,10 +454,9 @@ TAO_NAMESPACE  POA_IR
 
 
     virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        const char* logical_type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual void* _downcast (
         const char* logical_type_id
@@ -497,245 +465,230 @@ TAO_NAMESPACE  POA_IR
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
-        void *_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     ::IR::ProvidesDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual const char* _interface_repository_id (void) const;
 
     virtual CORBA_InterfaceDef_ptr interface_type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_interface_type_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void move_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void destroy_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
   };
 
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   class  _TAO_ProvidesDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ProvidesDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_ProvidesDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_ProvidesDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ::IR::_TAO_ProvidesDef_Proxy_Impl &select_proxy (
-      ::IR::ProvidesDef *object,
-      CORBA_Environment &ACE_TRY_ENV
+      ::IR::ProvidesDef *object
+      TAO_ENV_ARG_DECL
     );
-  
+
   private:
 
     // Helper methods that takes care to create the proxy
     // as soon as their use is necessary.
     void create_proxy (
-      int collocation_strategy,
-      CORBA::Environment &ACE_TRY_ENV
+      int collocation_strategy
+      TAO_ENV_ARG_DECL
     );
-    
+
 private:
-  
+
     // Caches the proxy implementations. The proxy implementation
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::IR::_TAO_ProvidesDef_Proxy_Impl
     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-    
+
     TAO_SYNCH_MUTEX mutex_;
     // This funxtion is used to get an handle to the unique instance
     // of the Strategized Proxy Broker that is available for a given
     // interface.
-  
+
   public:
     static _TAO_ProvidesDef_Strategized_Proxy_Broker *the_TAO_ProvidesDef_Strategized_Proxy_Broker (void);
   };
-  
-  
+
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-  
-  class  _TAO_ProvidesDef_ThruPOA_Proxy_Impl : 
+
+  class  _TAO_ProvidesDef_ThruPOA_Proxy_Impl :
     public virtual ::IR::_TAO_ProvidesDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
-    
+
   {
   public:
     _TAO_ProvidesDef_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_ProvidesDef_ThruPOA_Proxy_Impl (void) { }
-    
+
     virtual CORBA_InterfaceDef_ptr interface_type (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-    
+
+
   };
-  
+
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   class UsesDef;
   typedef UsesDef *UsesDef_ptr;
   // Forward Classes Declaration
   class _TAO_UsesDef_ThruPOA_Proxy_Impl;
   class _TAO_UsesDef_Strategized_Proxy_Broker;
-  
+
   class  UsesDef : public virtual POA_CORBA_Contained
   {
   protected:
@@ -747,10 +700,9 @@ private:
 
 
     virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        const char* logical_type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual void* _downcast (
         const char* logical_type_id
@@ -759,268 +711,252 @@ private:
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
-        void *_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     ::IR::UsesDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual const char* _interface_repository_id (void) const;
 
     virtual CORBA_InterfaceDef_ptr interface_type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_interface_type_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual CORBA::Boolean is_multiple (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_is_multiple_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void move_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void destroy_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
   };
 
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   class  _TAO_UsesDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_UsesDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_UsesDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_UsesDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ::IR::_TAO_UsesDef_Proxy_Impl &select_proxy (
-      ::IR::UsesDef *object,
-      CORBA_Environment &ACE_TRY_ENV
+      ::IR::UsesDef *object
+      TAO_ENV_ARG_DECL
     );
-  
+
   private:
 
     // Helper methods that takes care to create the proxy
     // as soon as their use is necessary.
     void create_proxy (
-      int collocation_strategy,
-      CORBA::Environment &ACE_TRY_ENV
+      int collocation_strategy
+      TAO_ENV_ARG_DECL
     );
-    
+
 private:
-  
+
     // Caches the proxy implementations. The proxy implementation
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::IR::_TAO_UsesDef_Proxy_Impl
     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-    
+
     TAO_SYNCH_MUTEX mutex_;
     // This funxtion is used to get an handle to the unique instance
     // of the Strategized Proxy Broker that is available for a given
     // interface.
-  
+
   public:
     static _TAO_UsesDef_Strategized_Proxy_Broker *the_TAO_UsesDef_Strategized_Proxy_Broker (void);
   };
-  
-  
+
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-  
-  class  _TAO_UsesDef_ThruPOA_Proxy_Impl : 
+
+  class  _TAO_UsesDef_ThruPOA_Proxy_Impl :
     public virtual ::IR::_TAO_UsesDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
-    
+
   {
   public:
     _TAO_UsesDef_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_UsesDef_ThruPOA_Proxy_Impl (void) { }
-    
+
     virtual CORBA_InterfaceDef_ptr interface_type (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual CORBA::Boolean is_multiple (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-    
+
+
   };
-  
+
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   class EventDef;
   typedef EventDef *EventDef_ptr;
   // Forward Classes Declaration
   class _TAO_EventDef_ThruPOA_Proxy_Impl;
   class _TAO_EventDef_Strategized_Proxy_Broker;
-  
+
   class  EventDef : public virtual POA_CORBA_Contained
   {
   protected:
@@ -1032,10 +968,9 @@ private:
 
 
     virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        const char* logical_type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual void* _downcast (
         const char* logical_type_id
@@ -1044,270 +979,254 @@ private:
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
-        void *_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     ::IR::EventDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual const char* _interface_repository_id (void) const;
 
     virtual CORBA::Boolean is_a (
-        const char * event_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * event_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void is_a_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual CORBA_ValueDef_ptr event (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_event_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void move_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void destroy_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
   };
 
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   class  _TAO_EventDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_EventDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_EventDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_EventDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ::IR::_TAO_EventDef_Proxy_Impl &select_proxy (
-      ::IR::EventDef *object,
-      CORBA_Environment &ACE_TRY_ENV
+      ::IR::EventDef *object
+      TAO_ENV_ARG_DECL
     );
-  
+
   private:
 
     // Helper methods that takes care to create the proxy
     // as soon as their use is necessary.
     void create_proxy (
-      int collocation_strategy,
-      CORBA::Environment &ACE_TRY_ENV
+      int collocation_strategy
+      TAO_ENV_ARG_DECL
     );
-    
+
 private:
-  
+
     // Caches the proxy implementations. The proxy implementation
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::IR::_TAO_EventDef_Proxy_Impl
     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-    
+
     TAO_SYNCH_MUTEX mutex_;
     // This funxtion is used to get an handle to the unique instance
     // of the Strategized Proxy Broker that is available for a given
     // interface.
-  
+
   public:
     static _TAO_EventDef_Strategized_Proxy_Broker *the_TAO_EventDef_Strategized_Proxy_Broker (void);
   };
-  
-  
+
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-  
-  class  _TAO_EventDef_ThruPOA_Proxy_Impl : 
+
+  class  _TAO_EventDef_ThruPOA_Proxy_Impl :
     public virtual ::IR::_TAO_EventDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
-    
+
   {
   public:
     _TAO_EventDef_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_EventDef_ThruPOA_Proxy_Impl (void) { }
-    
+
     virtual CORBA::Boolean is_a (
         CORBA_Object *_collocated_tao_target_,
-        const char * event_id,
-        CORBA::Environment &ACE_TRY_ENV
+        const char * event_id
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual CORBA_ValueDef_ptr event (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-    
+
+
   };
-  
+
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   class EmitsDef;
   typedef EmitsDef *EmitsDef_ptr;
   // Forward Classes Declaration
   class _TAO_EmitsDef_ThruPOA_Proxy_Impl;
   class _TAO_EmitsDef_Strategized_Proxy_Broker;
-  
+
   class  EmitsDef : public virtual EventDef
   {
   protected:
@@ -1319,10 +1238,9 @@ private:
 
 
     virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        const char* logical_type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual void* _downcast (
         const char* logical_type_id
@@ -1331,238 +1249,222 @@ private:
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
-        void *_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     ::IR::EmitsDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual const char* _interface_repository_id (void) const;
 
     static void is_a_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_event_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void move_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void destroy_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
   };
 
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   class  _TAO_EmitsDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_EmitsDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_EmitsDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_EmitsDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ::IR::_TAO_EmitsDef_Proxy_Impl &select_proxy (
-      ::IR::EmitsDef *object,
-      CORBA_Environment &ACE_TRY_ENV
+      ::IR::EmitsDef *object
+      TAO_ENV_ARG_DECL
     );
-  
+
   private:
 
     // Helper methods that takes care to create the proxy
     // as soon as their use is necessary.
     void create_proxy (
-      int collocation_strategy,
-      CORBA::Environment &ACE_TRY_ENV
+      int collocation_strategy
+      TAO_ENV_ARG_DECL
     );
-    
+
 private:
-  
+
     // Caches the proxy implementations. The proxy implementation
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::IR::_TAO_EmitsDef_Proxy_Impl
     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-    
+
     TAO_SYNCH_MUTEX mutex_;
     // This funxtion is used to get an handle to the unique instance
     // of the Strategized Proxy Broker that is available for a given
     // interface.
-  
+
   public:
     static _TAO_EmitsDef_Strategized_Proxy_Broker *the_TAO_EmitsDef_Strategized_Proxy_Broker (void);
   };
-  
-  
+
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-  
-  class  _TAO_EmitsDef_ThruPOA_Proxy_Impl : 
+
+  class  _TAO_EmitsDef_ThruPOA_Proxy_Impl :
     public virtual ::IR::_TAO_EmitsDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl
-    
+
   {
   public:
     _TAO_EmitsDef_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_EmitsDef_ThruPOA_Proxy_Impl (void) { }
-    
+
   };
-  
+
 
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   class PublishesDef;
   typedef PublishesDef *PublishesDef_ptr;
   // Forward Classes Declaration
   class _TAO_PublishesDef_ThruPOA_Proxy_Impl;
   class _TAO_PublishesDef_Strategized_Proxy_Broker;
-  
+
   class  PublishesDef : public virtual EventDef
   {
   protected:
@@ -1574,10 +1476,9 @@ private:
 
 
     virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        const char* logical_type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual void* _downcast (
         const char* logical_type_id
@@ -1586,238 +1487,222 @@ private:
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
-        void *_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     ::IR::PublishesDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual const char* _interface_repository_id (void) const;
 
     static void is_a_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_event_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void move_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void destroy_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
   };
 
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   class  _TAO_PublishesDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_PublishesDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_PublishesDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_PublishesDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ::IR::_TAO_PublishesDef_Proxy_Impl &select_proxy (
-      ::IR::PublishesDef *object,
-      CORBA_Environment &ACE_TRY_ENV
+      ::IR::PublishesDef *object
+      TAO_ENV_ARG_DECL
     );
-  
+
   private:
 
     // Helper methods that takes care to create the proxy
     // as soon as their use is necessary.
     void create_proxy (
-      int collocation_strategy,
-      CORBA::Environment &ACE_TRY_ENV
+      int collocation_strategy
+      TAO_ENV_ARG_DECL
     );
-    
+
 private:
-  
+
     // Caches the proxy implementations. The proxy implementation
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::IR::_TAO_PublishesDef_Proxy_Impl
     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-    
+
     TAO_SYNCH_MUTEX mutex_;
     // This funxtion is used to get an handle to the unique instance
     // of the Strategized Proxy Broker that is available for a given
     // interface.
-  
+
   public:
     static _TAO_PublishesDef_Strategized_Proxy_Broker *the_TAO_PublishesDef_Strategized_Proxy_Broker (void);
   };
-  
-  
+
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-  
-  class  _TAO_PublishesDef_ThruPOA_Proxy_Impl : 
+
+  class  _TAO_PublishesDef_ThruPOA_Proxy_Impl :
     public virtual ::IR::_TAO_PublishesDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl
-    
+
   {
   public:
     _TAO_PublishesDef_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_PublishesDef_ThruPOA_Proxy_Impl (void) { }
-    
+
   };
-  
+
 
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   class ConsumesDef;
   typedef ConsumesDef *ConsumesDef_ptr;
   // Forward Classes Declaration
   class _TAO_ConsumesDef_ThruPOA_Proxy_Impl;
   class _TAO_ConsumesDef_Strategized_Proxy_Broker;
-  
+
   class  ConsumesDef : public virtual EventDef
   {
   protected:
@@ -1829,10 +1714,9 @@ private:
 
 
     virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        const char* logical_type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual void* _downcast (
         const char* logical_type_id
@@ -1841,238 +1725,222 @@ private:
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
-        void *_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     ::IR::ConsumesDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual const char* _interface_repository_id (void) const;
 
     static void is_a_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_event_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void move_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void destroy_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
   };
 
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   class  _TAO_ConsumesDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ConsumesDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_ConsumesDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_ConsumesDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ::IR::_TAO_ConsumesDef_Proxy_Impl &select_proxy (
-      ::IR::ConsumesDef *object,
-      CORBA_Environment &ACE_TRY_ENV
+      ::IR::ConsumesDef *object
+      TAO_ENV_ARG_DECL
     );
-  
+
   private:
 
     // Helper methods that takes care to create the proxy
     // as soon as their use is necessary.
     void create_proxy (
-      int collocation_strategy,
-      CORBA::Environment &ACE_TRY_ENV
+      int collocation_strategy
+      TAO_ENV_ARG_DECL
     );
-    
+
 private:
-  
+
     // Caches the proxy implementations. The proxy implementation
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::IR::_TAO_ConsumesDef_Proxy_Impl
     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-    
+
     TAO_SYNCH_MUTEX mutex_;
     // This funxtion is used to get an handle to the unique instance
     // of the Strategized Proxy Broker that is available for a given
     // interface.
-  
+
   public:
     static _TAO_ConsumesDef_Strategized_Proxy_Broker *the_TAO_ConsumesDef_Strategized_Proxy_Broker (void);
   };
-  
-  
+
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-  
-  class  _TAO_ConsumesDef_ThruPOA_Proxy_Impl : 
+
+  class  _TAO_ConsumesDef_ThruPOA_Proxy_Impl :
     public virtual ::IR::_TAO_ConsumesDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl
-    
+
   {
   public:
     _TAO_ConsumesDef_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_ConsumesDef_ThruPOA_Proxy_Impl (void) { }
-    
+
   };
-  
+
 
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   class ComponentDef;
   typedef ComponentDef *ComponentDef_ptr;
   // Forward Classes Declaration
   class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
   class _TAO_ComponentDef_Strategized_Proxy_Broker;
-  
+
   class  ComponentDef : public virtual POA_CORBA_InterfaceDef
   {
   protected:
@@ -2084,10 +1952,9 @@ private:
 
 
     virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        const char* logical_type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual void* _downcast (
         const char* logical_type_id
@@ -2096,190 +1963,179 @@ private:
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
-        void *_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     ::IR::ComponentDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual const char* _interface_repository_id (void) const;
 
     virtual CORBA_InterfaceDefSeq * supported_interfaces (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_supported_interfaces_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual void supported_interfaces (
-        const CORBA_InterfaceDefSeq & supported_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InterfaceDefSeq & supported_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _set_supported_interfaces_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::ComponentDef_ptr base_component (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_base_component_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::ProvidesDefSeq * provides_interfaces (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_provides_interfaces_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::UsesDefSeq * uses_interfaces (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_uses_interfaces_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::EmitsDefSeq * emits_events (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_emits_events_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::PublishesDefSeq * publishes_events (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_publishes_events_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::ConsumesDefSeq * consumes_events (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_consumes_events_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual CORBA::Boolean is_basic (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_is_basic_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::ProvidesDef_ptr create_provides (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_InterfaceDef_ptr interface_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_InterfaceDef_ptr interface_type
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void create_provides_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::UsesDef_ptr create_uses (
@@ -2287,589 +2143,548 @@ private:
         const char * name,
         const char * version,
         CORBA_InterfaceDef_ptr interface_type,
-        CORBA::Boolean is_multiple,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Boolean is_multiple
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void create_uses_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::EmitsDef_ptr create_emits (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_ValueDef_ptr value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_ValueDef_ptr value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void create_emits_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::PublishesDef_ptr create_publishes (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_ValueDef_ptr value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_ValueDef_ptr value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void create_publishes_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::ConsumesDef_ptr create_consumes (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_ValueDef_ptr value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_ValueDef_ptr value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void create_consumes_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _get_base_interfaces_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_base_interfaces_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void is_a_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_interface_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_attribute_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_operation_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void lookup_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void contents_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void lookup_name_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_contents_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_module_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_constant_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_struct_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_union_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_enum_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_alias_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_interface_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_value_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_value_box_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_exception_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_native_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_abstract_interface_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_local_interface_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void move_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_type_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void destroy_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
   };
 
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   class  _TAO_ComponentDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ComponentDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_ComponentDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_ComponentDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ::IR::_TAO_ComponentDef_Proxy_Impl &select_proxy (
-      ::IR::ComponentDef *object,
-      CORBA_Environment &ACE_TRY_ENV
+      ::IR::ComponentDef *object
+      TAO_ENV_ARG_DECL
     );
-  
+
   private:
 
     // Helper methods that takes care to create the proxy
     // as soon as their use is necessary.
     void create_proxy (
-      int collocation_strategy,
-      CORBA::Environment &ACE_TRY_ENV
+      int collocation_strategy
+      TAO_ENV_ARG_DECL
     );
-    
+
 private:
-  
+
     // Caches the proxy implementations. The proxy implementation
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::IR::_TAO_ComponentDef_Proxy_Impl
     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-    
+
     TAO_SYNCH_MUTEX mutex_;
     // This funxtion is used to get an handle to the unique instance
     // of the Strategized Proxy Broker that is available for a given
     // interface.
-  
+
   public:
     static _TAO_ComponentDef_Strategized_Proxy_Broker *the_TAO_ComponentDef_Strategized_Proxy_Broker (void);
   };
-  
-  
+
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-  
-  class  _TAO_ComponentDef_ThruPOA_Proxy_Impl : 
+
+  class  _TAO_ComponentDef_ThruPOA_Proxy_Impl :
     public virtual ::IR::_TAO_ComponentDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::_TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl
-    
+
   {
   public:
     _TAO_ComponentDef_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_ComponentDef_ThruPOA_Proxy_Impl (void) { }
-    
+
     virtual CORBA_InterfaceDefSeq * supported_interfaces (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual void supported_interfaces (
         CORBA_Object *_collocated_tao_target_,
-        const CORBA_InterfaceDefSeq & supported_interfaces,
-        CORBA::Environment &ACE_TRY_ENV
+        const CORBA_InterfaceDefSeq & supported_interfaces
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::ComponentDef_ptr base_component (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::ProvidesDefSeq * provides_interfaces (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::UsesDefSeq * uses_interfaces (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::EmitsDefSeq * emits_events (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::PublishesDefSeq * publishes_events (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::ConsumesDefSeq * consumes_events (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual CORBA::Boolean is_basic (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::ProvidesDef_ptr create_provides (
         CORBA_Object *_collocated_tao_target_,
         const char * id,
         const char * name,
         const char * version,
-        CORBA_InterfaceDef_ptr interface_type,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_InterfaceDef_ptr interface_type
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::UsesDef_ptr create_uses (
         CORBA_Object *_collocated_tao_target_,
         const char * id,
         const char * name,
         const char * version,
         CORBA_InterfaceDef_ptr interface_type,
-        CORBA::Boolean is_multiple,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA::Boolean is_multiple
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::EmitsDef_ptr create_emits (
         CORBA_Object *_collocated_tao_target_,
         const char * id,
         const char * name,
         const char * version,
-        CORBA_ValueDef_ptr value,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_ValueDef_ptr value
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::PublishesDef_ptr create_publishes (
         CORBA_Object *_collocated_tao_target_,
         const char * id,
         const char * name,
         const char * version,
-        CORBA_ValueDef_ptr value,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_ValueDef_ptr value
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::ConsumesDef_ptr create_consumes (
         CORBA_Object *_collocated_tao_target_,
         const char * id,
         const char * name,
         const char * version,
-        CORBA_ValueDef_ptr value,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_ValueDef_ptr value
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-    
+
+
   };
-  
+
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   class PrimaryKeyDef;
   typedef PrimaryKeyDef *PrimaryKeyDef_ptr;
   // Forward Classes Declaration
   class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl;
   class _TAO_PrimaryKeyDef_Strategized_Proxy_Broker;
-  
+
   class  PrimaryKeyDef : public virtual POA_CORBA_Contained
   {
   protected:
@@ -2881,10 +2696,9 @@ private:
 
 
     virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        const char* logical_type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual void* _downcast (
         const char* logical_type_id
@@ -2893,270 +2707,254 @@ private:
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
-        void *_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     ::IR::PrimaryKeyDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual const char* _interface_repository_id (void) const;
 
     virtual CORBA::Boolean is_a (
-        const char * primary_key_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * primary_key_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void is_a_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual CORBA_ValueDef_ptr primary_key (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_primary_key_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void move_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void destroy_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
   };
 
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   class  _TAO_PrimaryKeyDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_PrimaryKeyDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ::IR::_TAO_PrimaryKeyDef_Proxy_Impl &select_proxy (
-      ::IR::PrimaryKeyDef *object,
-      CORBA_Environment &ACE_TRY_ENV
+      ::IR::PrimaryKeyDef *object
+      TAO_ENV_ARG_DECL
     );
-  
+
   private:
 
     // Helper methods that takes care to create the proxy
     // as soon as their use is necessary.
     void create_proxy (
-      int collocation_strategy,
-      CORBA::Environment &ACE_TRY_ENV
+      int collocation_strategy
+      TAO_ENV_ARG_DECL
     );
-    
+
 private:
-  
+
     // Caches the proxy implementations. The proxy implementation
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::IR::_TAO_PrimaryKeyDef_Proxy_Impl
     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-    
+
     TAO_SYNCH_MUTEX mutex_;
     // This funxtion is used to get an handle to the unique instance
     // of the Strategized Proxy Broker that is available for a given
     // interface.
-  
+
   public:
     static _TAO_PrimaryKeyDef_Strategized_Proxy_Broker *the_TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void);
   };
-  
-  
+
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-  
-  class  _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl : 
+
+  class  _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl :
     public virtual ::IR::_TAO_PrimaryKeyDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
-    
+
   {
   public:
     _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl (void) { }
-    
+
     virtual CORBA::Boolean is_a (
         CORBA_Object *_collocated_tao_target_,
-        const char * primary_key_id,
-        CORBA::Environment &ACE_TRY_ENV
+        const char * primary_key_id
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual CORBA_ValueDef_ptr primary_key (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-    
+
+
   };
-  
+
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   class FactoryDef;
   typedef FactoryDef *FactoryDef_ptr;
   // Forward Classes Declaration
   class _TAO_FactoryDef_ThruPOA_Proxy_Impl;
   class _TAO_FactoryDef_Strategized_Proxy_Broker;
-  
+
   class  FactoryDef : public virtual POA_CORBA_OperationDef
   {
   protected:
@@ -3168,10 +2966,9 @@ private:
 
 
     virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        const char* logical_type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual void* _downcast (
         const char* logical_type_id
@@ -3180,310 +2977,285 @@ private:
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
-        void *_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     ::IR::FactoryDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual const char* _interface_repository_id (void) const;
 
     static void _get_result_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_result_def_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_result_def_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_params_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_params_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_mode_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_mode_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_contexts_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_contexts_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_exceptions_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_exceptions_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void move_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void destroy_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
   };
 
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   class  _TAO_FactoryDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_FactoryDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_FactoryDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_FactoryDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ::IR::_TAO_FactoryDef_Proxy_Impl &select_proxy (
-      ::IR::FactoryDef *object,
-      CORBA_Environment &ACE_TRY_ENV
+      ::IR::FactoryDef *object
+      TAO_ENV_ARG_DECL
     );
-  
+
   private:
 
     // Helper methods that takes care to create the proxy
     // as soon as their use is necessary.
     void create_proxy (
-      int collocation_strategy,
-      CORBA::Environment &ACE_TRY_ENV
+      int collocation_strategy
+      TAO_ENV_ARG_DECL
     );
-    
+
 private:
-  
+
     // Caches the proxy implementations. The proxy implementation
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::IR::_TAO_FactoryDef_Proxy_Impl
     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-    
+
     TAO_SYNCH_MUTEX mutex_;
     // This funxtion is used to get an handle to the unique instance
     // of the Strategized Proxy Broker that is available for a given
     // interface.
-  
+
   public:
     static _TAO_FactoryDef_Strategized_Proxy_Broker *the_TAO_FactoryDef_Strategized_Proxy_Broker (void);
   };
-  
-  
+
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-  
-  class  _TAO_FactoryDef_ThruPOA_Proxy_Impl : 
+
+  class  _TAO_FactoryDef_ThruPOA_Proxy_Impl :
     public virtual ::IR::_TAO_FactoryDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::_TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl
-    
+
   {
   public:
     _TAO_FactoryDef_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_FactoryDef_ThruPOA_Proxy_Impl (void) { }
-    
+
   };
-  
+
 
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   class FinderDef;
   typedef FinderDef *FinderDef_ptr;
   // Forward Classes Declaration
   class _TAO_FinderDef_ThruPOA_Proxy_Impl;
   class _TAO_FinderDef_Strategized_Proxy_Broker;
-  
+
   class  FinderDef : public virtual POA_CORBA_OperationDef
   {
   protected:
@@ -3495,10 +3267,9 @@ private:
 
 
     virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        const char* logical_type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual void* _downcast (
         const char* logical_type_id
@@ -3507,310 +3278,285 @@ private:
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
-        void *_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     ::IR::FinderDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual const char* _interface_repository_id (void) const;
 
     static void _get_result_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_result_def_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_result_def_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_params_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_params_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_mode_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_mode_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_contexts_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_contexts_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_exceptions_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_exceptions_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void move_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void destroy_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
   };
 
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   class  _TAO_FinderDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_FinderDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_FinderDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_FinderDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ::IR::_TAO_FinderDef_Proxy_Impl &select_proxy (
-      ::IR::FinderDef *object,
-      CORBA_Environment &ACE_TRY_ENV
+      ::IR::FinderDef *object
+      TAO_ENV_ARG_DECL
     );
-  
+
   private:
 
     // Helper methods that takes care to create the proxy
     // as soon as their use is necessary.
     void create_proxy (
-      int collocation_strategy,
-      CORBA::Environment &ACE_TRY_ENV
+      int collocation_strategy
+      TAO_ENV_ARG_DECL
     );
-    
+
 private:
-  
+
     // Caches the proxy implementations. The proxy implementation
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::IR::_TAO_FinderDef_Proxy_Impl
     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-    
+
     TAO_SYNCH_MUTEX mutex_;
     // This funxtion is used to get an handle to the unique instance
     // of the Strategized Proxy Broker that is available for a given
     // interface.
-  
+
   public:
     static _TAO_FinderDef_Strategized_Proxy_Broker *the_TAO_FinderDef_Strategized_Proxy_Broker (void);
   };
-  
-  
+
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-  
-  class  _TAO_FinderDef_ThruPOA_Proxy_Impl : 
+
+  class  _TAO_FinderDef_ThruPOA_Proxy_Impl :
     public virtual ::IR::_TAO_FinderDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::_TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl
-    
+
   {
   public:
     _TAO_FinderDef_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_FinderDef_ThruPOA_Proxy_Impl (void) { }
-    
+
   };
-  
+
 
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   class HomeDef;
   typedef HomeDef *HomeDef_ptr;
   // Forward Classes Declaration
   class _TAO_HomeDef_ThruPOA_Proxy_Impl;
   class _TAO_HomeDef_Strategized_Proxy_Broker;
-  
+
   class  HomeDef : public virtual POA_CORBA_InterfaceDef
   {
   protected:
@@ -3822,10 +3568,9 @@ private:
 
 
     virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        const char* logical_type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual void* _downcast (
         const char* logical_type_id
@@ -3834,144 +3579,136 @@ private:
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
-        void *_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     ::IR::HomeDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual const char* _interface_repository_id (void) const;
 
     virtual IR::HomeDef_ptr base_home (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_base_home_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::ComponentDef_ptr managed_component (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_managed_component_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::PrimaryKeyDef_ptr primary_key (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_primary_key_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::FactoryDefSeq * factories (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_factories_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::FinderDefSeq * finders (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_finders_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual CORBA::Boolean is_basic (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_is_basic_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::PrimaryKeyDef_ptr create_primary_key (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_ValueDef_ptr primary_key,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_ValueDef_ptr primary_key
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void create_primary_key_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::FactoryDef_ptr create_factory (
@@ -3979,19 +3716,18 @@ private:
         const char * name,
         const char * version,
         const CORBA_ParDescriptionSeq & params,
-        const CORBA_ExceptionDefSeq & exceptions,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_ExceptionDefSeq & exceptions
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void create_factory_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::FinderDef_ptr create_finder (
@@ -3999,478 +3735,440 @@ private:
         const char * name,
         const char * version,
         const CORBA_ParDescriptionSeq & params,
-        const CORBA_ExceptionDefSeq & exceptions,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_ExceptionDefSeq & exceptions
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void create_finder_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _get_base_interfaces_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_base_interfaces_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void is_a_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_interface_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_attribute_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_operation_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void lookup_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void contents_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void lookup_name_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_contents_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_module_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_constant_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_struct_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_union_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_enum_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_alias_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_interface_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_value_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_value_box_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_exception_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_native_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_abstract_interface_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_local_interface_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void move_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_type_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void destroy_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
   };
 
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   class  _TAO_HomeDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_HomeDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_HomeDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_HomeDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ::IR::_TAO_HomeDef_Proxy_Impl &select_proxy (
-      ::IR::HomeDef *object,
-      CORBA_Environment &ACE_TRY_ENV
+      ::IR::HomeDef *object
+      TAO_ENV_ARG_DECL
     );
-  
+
   private:
 
     // Helper methods that takes care to create the proxy
     // as soon as their use is necessary.
     void create_proxy (
-      int collocation_strategy,
-      CORBA::Environment &ACE_TRY_ENV
+      int collocation_strategy
+      TAO_ENV_ARG_DECL
     );
-    
+
 private:
-  
+
     // Caches the proxy implementations. The proxy implementation
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::IR::_TAO_HomeDef_Proxy_Impl
     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-    
+
     TAO_SYNCH_MUTEX mutex_;
     // This funxtion is used to get an handle to the unique instance
     // of the Strategized Proxy Broker that is available for a given
     // interface.
-  
+
   public:
     static _TAO_HomeDef_Strategized_Proxy_Broker *the_TAO_HomeDef_Strategized_Proxy_Broker (void);
   };
-  
-  
+
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-  
-  class  _TAO_HomeDef_ThruPOA_Proxy_Impl : 
+
+  class  _TAO_HomeDef_ThruPOA_Proxy_Impl :
     public virtual ::IR::_TAO_HomeDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::_TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl
-    
+
   {
   public:
     _TAO_HomeDef_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_HomeDef_ThruPOA_Proxy_Impl (void) { }
-    
+
     virtual IR::HomeDef_ptr base_home (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::ComponentDef_ptr managed_component (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::PrimaryKeyDef_ptr primary_key (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::FactoryDefSeq * factories (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::FinderDefSeq * finders (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual CORBA::Boolean is_basic (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::PrimaryKeyDef_ptr create_primary_key (
         CORBA_Object *_collocated_tao_target_,
         const char * id,
         const char * name,
         const char * version,
-        CORBA_ValueDef_ptr primary_key,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_ValueDef_ptr primary_key
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::FactoryDef_ptr create_factory (
         CORBA_Object *_collocated_tao_target_,
         const char * id,
         const char * name,
         const char * version,
         const CORBA_ParDescriptionSeq & params,
-        const CORBA_ExceptionDefSeq & exceptions,
-        CORBA::Environment &ACE_TRY_ENV
+        const CORBA_ExceptionDefSeq & exceptions
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::FinderDef_ptr create_finder (
         CORBA_Object *_collocated_tao_target_,
         const char * id,
         const char * name,
         const char * version,
         const CORBA_ParDescriptionSeq & params,
-        const CORBA_ExceptionDefSeq & exceptions,
-        CORBA::Environment &ACE_TRY_ENV
+        const CORBA_ExceptionDefSeq & exceptions
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-    
+
+
   };
-  
+
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
 }
 TAO_NAMESPACE_CLOSE // module IR
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.i b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.i
index 4547c6557e1..96f3fd02407 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.i
@@ -22,3690 +22,3690 @@
 ACE_INLINE void POA_IR::ComponentRepository::lookup_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Repository::lookup_id_skel (
       req,
       (POA_CORBA_Repository_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::get_canonical_typecode_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Repository::get_canonical_typecode_skel (
       req,
       (POA_CORBA_Repository_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::get_primitive_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Repository::get_primitive_skel (
       req,
       (POA_CORBA_Repository_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_string_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Repository::create_string_skel (
       req,
       (POA_CORBA_Repository_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_wstring_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Repository::create_wstring_skel (
       req,
       (POA_CORBA_Repository_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_sequence_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Repository::create_sequence_skel (
       req,
       (POA_CORBA_Repository_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_array_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Repository::create_array_skel (
       req,
       (POA_CORBA_Repository_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_fixed_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Repository::create_fixed_skel (
       req,
       (POA_CORBA_Repository_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::UsesDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::UsesDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::EventDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::EventDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::is_a_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::EventDef_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_IR::EventDef::is_a_skel (
       req,
       (POA_IR::EventDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_get_event_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::EventDef_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_IR::EventDef::_get_event_skel (
       req,
       (POA_IR::EventDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::is_a_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::EventDef_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_IR::EventDef::is_a_skel (
       req,
       (POA_IR::EventDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_get_event_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::EventDef_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_IR::EventDef::_get_event_skel (
       req,
       (POA_IR::EventDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::is_a_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::EventDef_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_IR::EventDef::is_a_skel (
       req,
       (POA_IR::EventDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_get_event_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::EventDef_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_IR::EventDef::_get_event_skel (
       req,
       (POA_IR::EventDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_get_base_interfaces_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_InterfaceDef::_get_base_interfaces_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_set_base_interfaces_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_InterfaceDef::_set_base_interfaces_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::is_a_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_InterfaceDef::is_a_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::describe_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_InterfaceDef::describe_interface_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_attribute_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_InterfaceDef::create_attribute_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_operation_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_InterfaceDef::create_operation_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_result_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_OperationDef::_get_result_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_result_def_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_OperationDef::_get_result_def_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_set_result_def_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_OperationDef::_set_result_def_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_params_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_OperationDef::_get_params_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_set_params_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_OperationDef::_set_params_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_mode_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_OperationDef::_get_mode_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_set_mode_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_OperationDef::_set_mode_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_contexts_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_OperationDef::_get_contexts_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_set_contexts_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_OperationDef::_set_contexts_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_exceptions_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_OperationDef::_get_exceptions_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_set_exceptions_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_OperationDef::_set_exceptions_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_result_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_OperationDef::_get_result_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_result_def_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_OperationDef::_get_result_def_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_set_result_def_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_OperationDef::_set_result_def_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_params_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_OperationDef::_get_params_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_set_params_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_OperationDef::_set_params_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_mode_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_OperationDef::_get_mode_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_set_mode_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_OperationDef::_set_mode_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_contexts_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_OperationDef::_get_contexts_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_set_contexts_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_OperationDef::_set_contexts_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_exceptions_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_OperationDef::_get_exceptions_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_set_exceptions_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_OperationDef::_set_exceptions_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_get_base_interfaces_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_InterfaceDef::_get_base_interfaces_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_set_base_interfaces_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_InterfaceDef::_set_base_interfaces_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::is_a_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_InterfaceDef::is_a_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::describe_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_InterfaceDef::describe_interface_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_attribute_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_InterfaceDef::create_attribute_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_operation_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_InterfaceDef::create_operation_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h
index 59b55988067..500e9839c58 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h
@@ -49,7 +49,7 @@ TAO_NAMESPACE  POA_IR
     // ctor with T*, ownership flag and a POA
     ~ComponentRepository_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -61,241 +61,219 @@ TAO_NAMESPACE  POA_IR
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
     IR::ComponentDef_ptr create_component (
         const char * id,
         const char * name,
         const char * version,
         IR::ComponentDef_ptr base_component,
-        const CORBA_InterfaceDefSeq & supports_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InterfaceDefSeq & supports_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::HomeDef_ptr create_home (
         const char * id,
         const char * name,
         const char * version,
         IR::HomeDef_ptr base_home,
         IR::ComponentDef_ptr managed_component,
-        CORBA_ValueDef_ptr primary_key,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_ValueDef_ptr primary_key
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained_ptr lookup_id (
-        const char * search_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * search_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::TypeCode_ptr get_canonical_typecode (
-        CORBA::TypeCode_ptr tc,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::TypeCode_ptr tc
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_PrimitiveDef_ptr get_primitive (
-        CORBA::PrimitiveKind kind,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::PrimitiveKind kind
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_StringDef_ptr create_string (
-        CORBA::ULong bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::ULong bound
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_WstringDef_ptr create_wstring (
-        CORBA::ULong bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::ULong bound
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_SequenceDef_ptr create_sequence (
         CORBA::ULong bound,
-        CORBA_IDLType_ptr element_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_IDLType_ptr element_type
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ArrayDef_ptr create_array (
         CORBA::ULong length,
-        CORBA_IDLType_ptr element_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_IDLType_ptr element_type
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_FixedDef_ptr create_fixed (
         CORBA::UShort digits,
-        CORBA::Short scale,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Short scale
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained_ptr lookup (
-        const char * search_name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * search_name
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ContainedSeq * contents (
         CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Boolean exclude_inherited
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ContainedSeq * lookup_name (
         const char * search_name,
         CORBA::Long levels_to_search,
         CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Boolean exclude_inherited
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Container::DescriptionSeq * describe_contents (
         CORBA::DefinitionKind limit_type,
         CORBA::Boolean exclude_inherited,
-        CORBA::Long max_returned_objs,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Long max_returned_objs
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ModuleDef_ptr create_module (
         const char * id,
         const char * name,
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ConstantDef_ptr create_constant (
         const char * id,
         const char * name,
         const char * version,
         CORBA_IDLType_ptr type,
-        const CORBA::Any & value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA::Any & value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_StructDef_ptr create_struct (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_StructMemberSeq & members
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_UnionDef_ptr create_union (
         const char * id,
         const char * name,
         const char * version,
         CORBA_IDLType_ptr discriminator_type,
-        const CORBA_UnionMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_UnionMemberSeq & members
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_EnumDef_ptr create_enum (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_EnumMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_EnumMemberSeq & members
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_AliasDef_ptr create_alias (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_IDLType_ptr original_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_IDLType_ptr original_type
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_InterfaceDef_ptr create_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_InterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InterfaceDefSeq & base_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ValueDef_ptr create_value (
         const char * id,
         const char * name,
@@ -306,94 +284,86 @@ TAO_NAMESPACE  POA_IR
         CORBA::Boolean is_truncatable,
         const CORBA_ValueDefSeq & abstract_base_values,
         const CORBA_InterfaceDefSeq & supported_interfaces,
-        const CORBA_InitializerSeq & initializers,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InitializerSeq & initializers
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ValueBoxDef_ptr create_value_box (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_IDLType_ptr original_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_IDLType_ptr original_type_def
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ExceptionDef_ptr create_exception (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_StructMemberSeq & members
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_NativeDef_ptr create_native (
         const char * id,
         const char * name,
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_AbstractInterfaceDefSeq & base_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_LocalInterfaceDef_ptr create_local_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_InterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InterfaceDefSeq & base_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     ComponentRepository_tie (const ComponentRepository_tie &);
     void operator= (const ComponentRepository_tie &);
@@ -414,7 +384,7 @@ TAO_NAMESPACE  POA_IR
     // ctor with T*, ownership flag and a POA
     ~ProvidesDef_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -426,135 +396,120 @@ TAO_NAMESPACE  POA_IR
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
     CORBA_InterfaceDef_ptr interface_type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * id (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void id (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void name (
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * name
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * version (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void version (
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Container_ptr defined_in (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * absolute_name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Repository_ptr containing_repository (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained::Description * describe (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void move (
         CORBA_Container_ptr new_container,
         const char * new_name,
-        const char * new_version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * new_version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     ProvidesDef_tie (const ProvidesDef_tie &);
     void operator= (const ProvidesDef_tie &);
@@ -575,7 +530,7 @@ TAO_NAMESPACE  POA_IR
     // ctor with T*, ownership flag and a POA
     ~UsesDef_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -587,143 +542,127 @@ TAO_NAMESPACE  POA_IR
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
     CORBA_InterfaceDef_ptr interface_type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::Boolean is_multiple (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * id (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void id (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void name (
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * name
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * version (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void version (
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Container_ptr defined_in (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * absolute_name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Repository_ptr containing_repository (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained::Description * describe (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void move (
         CORBA_Container_ptr new_container,
         const char * new_name,
-        const char * new_version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * new_version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     UsesDef_tie (const UsesDef_tie &);
     void operator= (const UsesDef_tie &);
@@ -744,7 +683,7 @@ TAO_NAMESPACE  POA_IR
     // ctor with T*, ownership flag and a POA
     ~EventDef_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -756,144 +695,128 @@ TAO_NAMESPACE  POA_IR
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
     CORBA::Boolean is_a (
-        const char * event_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * event_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ValueDef_ptr event (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * id (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void id (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void name (
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * name
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * version (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void version (
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Container_ptr defined_in (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * absolute_name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Repository_ptr containing_repository (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained::Description * describe (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void move (
         CORBA_Container_ptr new_container,
         const char * new_name,
-        const char * new_version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * new_version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     EventDef_tie (const EventDef_tie &);
     void operator= (const EventDef_tie &);
@@ -914,7 +837,7 @@ TAO_NAMESPACE  POA_IR
     // ctor with T*, ownership flag and a POA
     ~EmitsDef_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -926,144 +849,128 @@ TAO_NAMESPACE  POA_IR
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
     CORBA::Boolean is_a (
-        const char * event_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * event_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ValueDef_ptr event (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * id (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void id (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void name (
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * name
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * version (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void version (
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Container_ptr defined_in (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * absolute_name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Repository_ptr containing_repository (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained::Description * describe (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void move (
         CORBA_Container_ptr new_container,
         const char * new_name,
-        const char * new_version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * new_version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     EmitsDef_tie (const EmitsDef_tie &);
     void operator= (const EmitsDef_tie &);
@@ -1084,7 +991,7 @@ TAO_NAMESPACE  POA_IR
     // ctor with T*, ownership flag and a POA
     ~PublishesDef_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -1096,144 +1003,128 @@ TAO_NAMESPACE  POA_IR
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
     CORBA::Boolean is_a (
-        const char * event_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * event_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ValueDef_ptr event (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * id (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void id (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void name (
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * name
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * version (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void version (
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Container_ptr defined_in (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * absolute_name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Repository_ptr containing_repository (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained::Description * describe (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void move (
         CORBA_Container_ptr new_container,
         const char * new_name,
-        const char * new_version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * new_version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     PublishesDef_tie (const PublishesDef_tie &);
     void operator= (const PublishesDef_tie &);
@@ -1254,7 +1145,7 @@ TAO_NAMESPACE  POA_IR
     // ctor with T*, ownership flag and a POA
     ~ConsumesDef_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -1266,144 +1157,128 @@ TAO_NAMESPACE  POA_IR
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
     CORBA::Boolean is_a (
-        const char * event_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * event_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ValueDef_ptr event (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * id (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void id (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void name (
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * name
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * version (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void version (
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Container_ptr defined_in (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * absolute_name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Repository_ptr containing_repository (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained::Description * describe (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void move (
         CORBA_Container_ptr new_container,
         const char * new_name,
-        const char * new_version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * new_version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     ConsumesDef_tie (const ConsumesDef_tie &);
     void operator= (const ConsumesDef_tie &);
@@ -1424,7 +1299,7 @@ TAO_NAMESPACE  POA_IR
     // ctor with T*, ownership flag and a POA
     ~ComponentDef_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -1436,193 +1311,173 @@ TAO_NAMESPACE  POA_IR
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
     CORBA_InterfaceDefSeq * supported_interfaces (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void supported_interfaces (
-        const CORBA_InterfaceDefSeq & supported_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InterfaceDefSeq & supported_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::ComponentDef_ptr base_component (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::ProvidesDefSeq * provides_interfaces (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::UsesDefSeq * uses_interfaces (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::EmitsDefSeq * emits_events (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::PublishesDefSeq * publishes_events (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::ConsumesDefSeq * consumes_events (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::Boolean is_basic (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::ProvidesDef_ptr create_provides (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_InterfaceDef_ptr interface_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_InterfaceDef_ptr interface_type
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::UsesDef_ptr create_uses (
         const char * id,
         const char * name,
         const char * version,
         CORBA_InterfaceDef_ptr interface_type,
-        CORBA::Boolean is_multiple,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Boolean is_multiple
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::EmitsDef_ptr create_emits (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_ValueDef_ptr value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_ValueDef_ptr value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::PublishesDef_ptr create_publishes (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_ValueDef_ptr value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_ValueDef_ptr value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::ConsumesDef_ptr create_consumes (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_ValueDef_ptr value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_ValueDef_ptr value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_InterfaceDefSeq * base_interfaces (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void base_interfaces (
-        const CORBA_InterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InterfaceDefSeq & base_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::Boolean is_a (
-        const char * interface_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * interface_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_AttributeDef_ptr create_attribute (
         const char * id,
         const char * name,
         const char * version,
         CORBA_IDLType_ptr type,
-        CORBA::AttributeMode mode,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::AttributeMode mode
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_OperationDef_ptr create_operation (
         const char * id,
         const char * name,
@@ -1631,141 +1486,129 @@ TAO_NAMESPACE  POA_IR
         CORBA::OperationMode mode,
         const CORBA_ParDescriptionSeq & params,
         const CORBA_ExceptionDefSeq & exceptions,
-        const CORBA_ContextIdSeq & contexts,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_ContextIdSeq & contexts
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained_ptr lookup (
-        const char * search_name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * search_name
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ContainedSeq * contents (
         CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Boolean exclude_inherited
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ContainedSeq * lookup_name (
         const char * search_name,
         CORBA::Long levels_to_search,
         CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Boolean exclude_inherited
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Container::DescriptionSeq * describe_contents (
         CORBA::DefinitionKind limit_type,
         CORBA::Boolean exclude_inherited,
-        CORBA::Long max_returned_objs,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Long max_returned_objs
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ModuleDef_ptr create_module (
         const char * id,
         const char * name,
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ConstantDef_ptr create_constant (
         const char * id,
         const char * name,
         const char * version,
         CORBA_IDLType_ptr type,
-        const CORBA::Any & value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA::Any & value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_StructDef_ptr create_struct (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_StructMemberSeq & members
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_UnionDef_ptr create_union (
         const char * id,
         const char * name,
         const char * version,
         CORBA_IDLType_ptr discriminator_type,
-        const CORBA_UnionMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_UnionMemberSeq & members
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_EnumDef_ptr create_enum (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_EnumMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_EnumMemberSeq & members
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_AliasDef_ptr create_alias (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_IDLType_ptr original_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_IDLType_ptr original_type
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_InterfaceDef_ptr create_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_InterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InterfaceDefSeq & base_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ValueDef_ptr create_value (
         const char * id,
         const char * name,
@@ -1776,196 +1619,176 @@ TAO_NAMESPACE  POA_IR
         CORBA::Boolean is_truncatable,
         const CORBA_ValueDefSeq & abstract_base_values,
         const CORBA_InterfaceDefSeq & supported_interfaces,
-        const CORBA_InitializerSeq & initializers,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InitializerSeq & initializers
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ValueBoxDef_ptr create_value_box (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_IDLType_ptr original_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_IDLType_ptr original_type_def
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ExceptionDef_ptr create_exception (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_StructMemberSeq & members
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_NativeDef_ptr create_native (
         const char * id,
         const char * name,
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_AbstractInterfaceDefSeq & base_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_LocalInterfaceDef_ptr create_local_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_InterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InterfaceDefSeq & base_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * id (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void id (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void name (
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * name
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * version (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void version (
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Container_ptr defined_in (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * absolute_name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Repository_ptr containing_repository (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained::Description * describe (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void move (
         CORBA_Container_ptr new_container,
         const char * new_name,
-        const char * new_version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * new_version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::TypeCode_ptr type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     ComponentDef_tie (const ComponentDef_tie &);
     void operator= (const ComponentDef_tie &);
@@ -1986,7 +1809,7 @@ TAO_NAMESPACE  POA_IR
     // ctor with T*, ownership flag and a POA
     ~PrimaryKeyDef_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -1998,144 +1821,128 @@ TAO_NAMESPACE  POA_IR
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
     CORBA::Boolean is_a (
-        const char * primary_key_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * primary_key_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ValueDef_ptr primary_key (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * id (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void id (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void name (
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * name
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * version (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void version (
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Container_ptr defined_in (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * absolute_name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Repository_ptr containing_repository (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained::Description * describe (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void move (
         CORBA_Container_ptr new_container,
         const char * new_name,
-        const char * new_version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * new_version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     PrimaryKeyDef_tie (const PrimaryKeyDef_tie &);
     void operator= (const PrimaryKeyDef_tie &);
@@ -2156,7 +1963,7 @@ TAO_NAMESPACE  POA_IR
     // ctor with T*, ownership flag and a POA
     ~FactoryDef_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -2168,220 +1975,195 @@ TAO_NAMESPACE  POA_IR
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
     CORBA::TypeCode_ptr result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_IDLType_ptr result_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void result_def (
-        CORBA_IDLType_ptr result_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_IDLType_ptr result_def
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ParDescriptionSeq * params (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void params (
-        const CORBA_ParDescriptionSeq & params,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_ParDescriptionSeq & params
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::OperationMode mode (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void mode (
-        CORBA::OperationMode mode,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::OperationMode mode
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ContextIdSeq * contexts (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void contexts (
-        const CORBA_ContextIdSeq & contexts,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_ContextIdSeq & contexts
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ExceptionDefSeq * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void exceptions (
-        const CORBA_ExceptionDefSeq & exceptions,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_ExceptionDefSeq & exceptions
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * id (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void id (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void name (
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * name
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * version (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void version (
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Container_ptr defined_in (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * absolute_name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Repository_ptr containing_repository (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained::Description * describe (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void move (
         CORBA_Container_ptr new_container,
         const char * new_name,
-        const char * new_version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * new_version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     FactoryDef_tie (const FactoryDef_tie &);
     void operator= (const FactoryDef_tie &);
@@ -2402,7 +2184,7 @@ TAO_NAMESPACE  POA_IR
     // ctor with T*, ownership flag and a POA
     ~FinderDef_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -2414,220 +2196,195 @@ TAO_NAMESPACE  POA_IR
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
     CORBA::TypeCode_ptr result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_IDLType_ptr result_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void result_def (
-        CORBA_IDLType_ptr result_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_IDLType_ptr result_def
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ParDescriptionSeq * params (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void params (
-        const CORBA_ParDescriptionSeq & params,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_ParDescriptionSeq & params
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::OperationMode mode (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void mode (
-        CORBA::OperationMode mode,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::OperationMode mode
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ContextIdSeq * contexts (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void contexts (
-        const CORBA_ContextIdSeq & contexts,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_ContextIdSeq & contexts
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ExceptionDefSeq * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void exceptions (
-        const CORBA_ExceptionDefSeq & exceptions,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_ExceptionDefSeq & exceptions
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * id (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void id (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void name (
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * name
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * version (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void version (
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Container_ptr defined_in (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * absolute_name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Repository_ptr containing_repository (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained::Description * describe (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void move (
         CORBA_Container_ptr new_container,
         const char * new_name,
-        const char * new_version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * new_version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     FinderDef_tie (const FinderDef_tie &);
     void operator= (const FinderDef_tie &);
@@ -2648,7 +2405,7 @@ TAO_NAMESPACE  POA_IR
     // ctor with T*, ownership flag and a POA
     ~HomeDef_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -2660,145 +2417,130 @@ TAO_NAMESPACE  POA_IR
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
     IR::HomeDef_ptr base_home (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::ComponentDef_ptr managed_component (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::PrimaryKeyDef_ptr primary_key (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::FactoryDefSeq * factories (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::FinderDefSeq * finders (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::Boolean is_basic (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::PrimaryKeyDef_ptr create_primary_key (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_ValueDef_ptr primary_key,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_ValueDef_ptr primary_key
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::FactoryDef_ptr create_factory (
         const char * id,
         const char * name,
         const char * version,
         const CORBA_ParDescriptionSeq & params,
-        const CORBA_ExceptionDefSeq & exceptions,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_ExceptionDefSeq & exceptions
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::FinderDef_ptr create_finder (
         const char * id,
         const char * name,
         const char * version,
         const CORBA_ParDescriptionSeq & params,
-        const CORBA_ExceptionDefSeq & exceptions,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_ExceptionDefSeq & exceptions
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_InterfaceDefSeq * base_interfaces (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void base_interfaces (
-        const CORBA_InterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InterfaceDefSeq & base_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::Boolean is_a (
-        const char * interface_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * interface_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_AttributeDef_ptr create_attribute (
         const char * id,
         const char * name,
         const char * version,
         CORBA_IDLType_ptr type,
-        CORBA::AttributeMode mode,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::AttributeMode mode
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_OperationDef_ptr create_operation (
         const char * id,
         const char * name,
@@ -2807,141 +2549,129 @@ TAO_NAMESPACE  POA_IR
         CORBA::OperationMode mode,
         const CORBA_ParDescriptionSeq & params,
         const CORBA_ExceptionDefSeq & exceptions,
-        const CORBA_ContextIdSeq & contexts,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_ContextIdSeq & contexts
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained_ptr lookup (
-        const char * search_name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * search_name
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ContainedSeq * contents (
         CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Boolean exclude_inherited
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ContainedSeq * lookup_name (
         const char * search_name,
         CORBA::Long levels_to_search,
         CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Boolean exclude_inherited
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Container::DescriptionSeq * describe_contents (
         CORBA::DefinitionKind limit_type,
         CORBA::Boolean exclude_inherited,
-        CORBA::Long max_returned_objs,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Long max_returned_objs
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ModuleDef_ptr create_module (
         const char * id,
         const char * name,
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ConstantDef_ptr create_constant (
         const char * id,
         const char * name,
         const char * version,
         CORBA_IDLType_ptr type,
-        const CORBA::Any & value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA::Any & value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_StructDef_ptr create_struct (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_StructMemberSeq & members
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_UnionDef_ptr create_union (
         const char * id,
         const char * name,
         const char * version,
         CORBA_IDLType_ptr discriminator_type,
-        const CORBA_UnionMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_UnionMemberSeq & members
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_EnumDef_ptr create_enum (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_EnumMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_EnumMemberSeq & members
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_AliasDef_ptr create_alias (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_IDLType_ptr original_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_IDLType_ptr original_type
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_InterfaceDef_ptr create_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_InterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InterfaceDefSeq & base_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ValueDef_ptr create_value (
         const char * id,
         const char * name,
@@ -2952,196 +2682,176 @@ TAO_NAMESPACE  POA_IR
         CORBA::Boolean is_truncatable,
         const CORBA_ValueDefSeq & abstract_base_values,
         const CORBA_InterfaceDefSeq & supported_interfaces,
-        const CORBA_InitializerSeq & initializers,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InitializerSeq & initializers
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ValueBoxDef_ptr create_value_box (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_IDLType_ptr original_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_IDLType_ptr original_type_def
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ExceptionDef_ptr create_exception (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_StructMemberSeq & members
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_NativeDef_ptr create_native (
         const char * id,
         const char * name,
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_AbstractInterfaceDefSeq & base_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_LocalInterfaceDef_ptr create_local_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_InterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InterfaceDefSeq & base_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * id (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void id (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void name (
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * name
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * version (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void version (
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Container_ptr defined_in (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * absolute_name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Repository_ptr containing_repository (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained::Description * describe (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void move (
         CORBA_Container_ptr new_container,
         const char * new_name,
-        const char * new_version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * new_version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::TypeCode_ptr type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     HomeDef_tie (const HomeDef_tie &);
     void operator= (const HomeDef_tie &);
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i
index fad9acbda38..6742e31f286 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i
@@ -23,30 +23,30 @@
 
 template <class T> ACE_INLINE
 POA_IR::ComponentRepository_tie<T>::ComponentRepository_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::ComponentRepository_tie<T>::ComponentRepository_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::ComponentRepository_tie<T>::ComponentRepository_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::ComponentRepository_tie<T>::ComponentRepository_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -90,12 +90,12 @@ POA_IR::ComponentRepository_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::ComponentRepository_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_IR::ComponentRepository_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->ComponentRepository::_default_POA (ACE_TRY_ENV);
+  return this->ComponentRepository::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
@@ -104,8 +104,8 @@ IR::ComponentDef_ptr POA_IR::ComponentRepository_tie<T>::create_component  (
     const char * name,
     const char * version,
     IR::ComponentDef_ptr base_component,
-    const CORBA_InterfaceDefSeq & supports_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & supports_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -116,8 +116,8 @@ id,
     name,
     version,
     base_component,
-    supports_interfaces,
-    ACE_TRY_ENV
+    supports_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -128,8 +128,8 @@ IR::HomeDef_ptr POA_IR::ComponentRepository_tie<T>::create_home  (
     const char * version,
     IR::HomeDef_ptr base_home,
     IR::ComponentDef_ptr managed_component,
-    CORBA_ValueDef_ptr primary_key,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_ValueDef_ptr primary_key
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -141,91 +141,91 @@ id,
     version,
     base_home,
     managed_component,
-    primary_key,
-    ACE_TRY_ENV
+    primary_key
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_IR::ComponentRepository_tie<T>::lookup_id  (
-    const char * search_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup_id (
-search_id,
-    ACE_TRY_ENV
+search_id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_IR::ComponentRepository_tie<T>::get_canonical_typecode  (
-    CORBA::TypeCode_ptr tc,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::TypeCode_ptr tc
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->get_canonical_typecode (
-tc,
-    ACE_TRY_ENV
+tc
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_PrimitiveDef_ptr POA_IR::ComponentRepository_tie<T>::get_primitive  (
-    CORBA::PrimitiveKind kind,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::PrimitiveKind kind
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->get_primitive (
-kind,
-    ACE_TRY_ENV
+kind
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_StringDef_ptr POA_IR::ComponentRepository_tie<T>::create_string  (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->create_string (
-bound,
-    ACE_TRY_ENV
+bound
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_WstringDef_ptr POA_IR::ComponentRepository_tie<T>::create_wstring  (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->create_wstring (
-bound,
-    ACE_TRY_ENV
+bound
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_SequenceDef_ptr POA_IR::ComponentRepository_tie<T>::create_sequence  (
     CORBA::ULong bound,
-    CORBA_IDLType_ptr element_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr element_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -233,16 +233,16 @@ CORBA_SequenceDef_ptr POA_IR::ComponentRepository_tie<T>::create_sequence  (
 {
   return this->ptr_->create_sequence (
 bound,
-    element_type,
-    ACE_TRY_ENV
+    element_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ArrayDef_ptr POA_IR::ComponentRepository_tie<T>::create_array  (
     CORBA::ULong length,
-    CORBA_IDLType_ptr element_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr element_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -250,16 +250,16 @@ CORBA_ArrayDef_ptr POA_IR::ComponentRepository_tie<T>::create_array  (
 {
   return this->ptr_->create_array (
 length,
-    element_type,
-    ACE_TRY_ENV
+    element_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_FixedDef_ptr POA_IR::ComponentRepository_tie<T>::create_fixed  (
     CORBA::UShort digits,
-    CORBA::Short scale,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Short scale
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -267,31 +267,31 @@ CORBA_FixedDef_ptr POA_IR::ComponentRepository_tie<T>::create_fixed  (
 {
   return this->ptr_->create_fixed (
 digits,
-    scale,
-    ACE_TRY_ENV
+    scale
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_IR::ComponentRepository_tie<T>::lookup  (
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup (
-search_name,
-    ACE_TRY_ENV
+search_name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_IR::ComponentRepository_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -299,8 +299,8 @@ CORBA_ContainedSeq * POA_IR::ComponentRepository_tie<T>::contents  (
 {
   return this->ptr_->contents (
 limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -309,8 +309,8 @@ CORBA_ContainedSeq * POA_IR::ComponentRepository_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -320,8 +320,8 @@ CORBA_ContainedSeq * POA_IR::ComponentRepository_tie<T>::lookup_name  (
 search_name,
     levels_to_search,
     limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -329,8 +329,8 @@ template <class T> ACE_INLINE
 CORBA_Container::DescriptionSeq * POA_IR::ComponentRepository_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Long max_returned_objs
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -339,8 +339,8 @@ CORBA_Container::DescriptionSeq * POA_IR::ComponentRepository_tie<T>::describe_c
   return this->ptr_->describe_contents (
 limit_type,
     exclude_inherited,
-    max_returned_objs,
-    ACE_TRY_ENV
+    max_returned_objs
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -348,8 +348,8 @@ template <class T> ACE_INLINE
 CORBA_ModuleDef_ptr POA_IR::ComponentRepository_tie<T>::create_module  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -358,8 +358,8 @@ CORBA_ModuleDef_ptr POA_IR::ComponentRepository_tie<T>::create_module  (
   return this->ptr_->create_module (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -369,8 +369,8 @@ CORBA_ConstantDef_ptr POA_IR::ComponentRepository_tie<T>::create_constant  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -381,8 +381,8 @@ id,
     name,
     version,
     type,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -391,8 +391,8 @@ CORBA_StructDef_ptr POA_IR::ComponentRepository_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -402,8 +402,8 @@ CORBA_StructDef_ptr POA_IR::ComponentRepository_tie<T>::create_struct  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -413,8 +413,8 @@ CORBA_UnionDef_ptr POA_IR::ComponentRepository_tie<T>::create_union  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -425,8 +425,8 @@ id,
     name,
     version,
     discriminator_type,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -435,8 +435,8 @@ CORBA_EnumDef_ptr POA_IR::ComponentRepository_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -446,8 +446,8 @@ CORBA_EnumDef_ptr POA_IR::ComponentRepository_tie<T>::create_enum  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -456,8 +456,8 @@ CORBA_AliasDef_ptr POA_IR::ComponentRepository_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -467,8 +467,8 @@ CORBA_AliasDef_ptr POA_IR::ComponentRepository_tie<T>::create_alias  (
 id,
     name,
     version,
-    original_type,
-    ACE_TRY_ENV
+    original_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -477,8 +477,8 @@ CORBA_InterfaceDef_ptr POA_IR::ComponentRepository_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -488,8 +488,8 @@ CORBA_InterfaceDef_ptr POA_IR::ComponentRepository_tie<T>::create_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -504,8 +504,8 @@ CORBA_ValueDef_ptr POA_IR::ComponentRepository_tie<T>::create_value  (
     CORBA::Boolean is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -521,8 +521,8 @@ id,
     is_truncatable,
     abstract_base_values,
     supported_interfaces,
-    initializers,
-    ACE_TRY_ENV
+    initializers
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -531,8 +531,8 @@ CORBA_ValueBoxDef_ptr POA_IR::ComponentRepository_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -542,8 +542,8 @@ CORBA_ValueBoxDef_ptr POA_IR::ComponentRepository_tie<T>::create_value_box  (
 id,
     name,
     version,
-    original_type_def,
-    ACE_TRY_ENV
+    original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -552,8 +552,8 @@ CORBA_ExceptionDef_ptr POA_IR::ComponentRepository_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -563,8 +563,8 @@ CORBA_ExceptionDef_ptr POA_IR::ComponentRepository_tie<T>::create_exception  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -572,8 +572,8 @@ template <class T> ACE_INLINE
 CORBA_NativeDef_ptr POA_IR::ComponentRepository_tie<T>::create_native  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -582,8 +582,8 @@ CORBA_NativeDef_ptr POA_IR::ComponentRepository_tie<T>::create_native  (
   return this->ptr_->create_native (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -592,8 +592,8 @@ CORBA_AbstractInterfaceDef_ptr POA_IR::ComponentRepository_tie<T>::create_abstra
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -603,8 +603,8 @@ CORBA_AbstractInterfaceDef_ptr POA_IR::ComponentRepository_tie<T>::create_abstra
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -613,8 +613,8 @@ CORBA_LocalInterfaceDef_ptr POA_IR::ComponentRepository_tie<T>::create_local_int
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -624,63 +624,63 @@ CORBA_LocalInterfaceDef_ptr POA_IR::ComponentRepository_tie<T>::create_local_int
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::ComponentRepository_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ComponentRepository_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_IR::ProvidesDef_tie<T>::ProvidesDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::ProvidesDef_tie<T>::ProvidesDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::ProvidesDef_tie<T>::ProvidesDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::ProvidesDef_tie<T>::ProvidesDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -724,160 +724,160 @@ POA_IR::ProvidesDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::ProvidesDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_IR::ProvidesDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->ProvidesDef::_default_POA (ACE_TRY_ENV);
+  return this->ProvidesDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDef_ptr POA_IR::ProvidesDef_tie<T>::interface_type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->interface_type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ProvidesDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ProvidesDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ProvidesDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ProvidesDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ProvidesDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ProvidesDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::ProvidesDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ProvidesDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::ProvidesDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::ProvidesDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -885,8 +885,8 @@ template <class T> ACE_INLINE
 void POA_IR::ProvidesDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -895,63 +895,63 @@ void POA_IR::ProvidesDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::ProvidesDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ProvidesDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_IR::UsesDef_tie<T>::UsesDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::UsesDef_tie<T>::UsesDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::UsesDef_tie<T>::UsesDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::UsesDef_tie<T>::UsesDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -995,173 +995,173 @@ POA_IR::UsesDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::UsesDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_IR::UsesDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->UsesDef::_default_POA (ACE_TRY_ENV);
+  return this->UsesDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDef_ptr POA_IR::UsesDef_tie<T>::interface_type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->interface_type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::UsesDef_tie<T>::is_multiple  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_multiple (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::UsesDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::UsesDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::UsesDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::UsesDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::UsesDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::UsesDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::UsesDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::UsesDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::UsesDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::UsesDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1169,8 +1169,8 @@ template <class T> ACE_INLINE
 void POA_IR::UsesDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1179,63 +1179,63 @@ void POA_IR::UsesDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::UsesDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::UsesDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_IR::EventDef_tie<T>::EventDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::EventDef_tie<T>::EventDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::EventDef_tie<T>::EventDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::EventDef_tie<T>::EventDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -1279,175 +1279,175 @@ POA_IR::EventDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::EventDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_IR::EventDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->EventDef::_default_POA (ACE_TRY_ENV);
+  return this->EventDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::EventDef_tie<T>::is_a  (
-    const char * event_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * event_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_a (
-event_id,
-    ACE_TRY_ENV
+event_id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ValueDef_ptr POA_IR::EventDef_tie<T>::event  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->event (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::EventDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::EventDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::EventDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::EventDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::EventDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::EventDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::EventDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::EventDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::EventDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::EventDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1455,8 +1455,8 @@ template <class T> ACE_INLINE
 void POA_IR::EventDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1465,63 +1465,63 @@ void POA_IR::EventDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::EventDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::EventDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_IR::EmitsDef_tie<T>::EmitsDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::EmitsDef_tie<T>::EmitsDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::EmitsDef_tie<T>::EmitsDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::EmitsDef_tie<T>::EmitsDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -1565,175 +1565,175 @@ POA_IR::EmitsDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::EmitsDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_IR::EmitsDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->EmitsDef::_default_POA (ACE_TRY_ENV);
+  return this->EmitsDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::EmitsDef_tie<T>::is_a  (
-    const char * event_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * event_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_a (
-event_id,
-    ACE_TRY_ENV
+event_id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ValueDef_ptr POA_IR::EmitsDef_tie<T>::event  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->event (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::EmitsDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::EmitsDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::EmitsDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::EmitsDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::EmitsDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::EmitsDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::EmitsDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::EmitsDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::EmitsDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::EmitsDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1741,8 +1741,8 @@ template <class T> ACE_INLINE
 void POA_IR::EmitsDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1751,63 +1751,63 @@ void POA_IR::EmitsDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::EmitsDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::EmitsDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_IR::PublishesDef_tie<T>::PublishesDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::PublishesDef_tie<T>::PublishesDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::PublishesDef_tie<T>::PublishesDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::PublishesDef_tie<T>::PublishesDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -1851,175 +1851,175 @@ POA_IR::PublishesDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::PublishesDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_IR::PublishesDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->PublishesDef::_default_POA (ACE_TRY_ENV);
+  return this->PublishesDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::PublishesDef_tie<T>::is_a  (
-    const char * event_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * event_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_a (
-event_id,
-    ACE_TRY_ENV
+event_id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ValueDef_ptr POA_IR::PublishesDef_tie<T>::event  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->event (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::PublishesDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::PublishesDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::PublishesDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::PublishesDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::PublishesDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::PublishesDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::PublishesDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::PublishesDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::PublishesDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::PublishesDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2027,8 +2027,8 @@ template <class T> ACE_INLINE
 void POA_IR::PublishesDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2037,63 +2037,63 @@ void POA_IR::PublishesDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::PublishesDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::PublishesDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_IR::ConsumesDef_tie<T>::ConsumesDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::ConsumesDef_tie<T>::ConsumesDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::ConsumesDef_tie<T>::ConsumesDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::ConsumesDef_tie<T>::ConsumesDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -2137,175 +2137,175 @@ POA_IR::ConsumesDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::ConsumesDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_IR::ConsumesDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->ConsumesDef::_default_POA (ACE_TRY_ENV);
+  return this->ConsumesDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::ConsumesDef_tie<T>::is_a  (
-    const char * event_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * event_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_a (
-event_id,
-    ACE_TRY_ENV
+event_id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ValueDef_ptr POA_IR::ConsumesDef_tie<T>::event  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->event (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ConsumesDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ConsumesDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ConsumesDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ConsumesDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ConsumesDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ConsumesDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::ConsumesDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ConsumesDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::ConsumesDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::ConsumesDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2313,8 +2313,8 @@ template <class T> ACE_INLINE
 void POA_IR::ConsumesDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2323,63 +2323,63 @@ void POA_IR::ConsumesDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::ConsumesDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ConsumesDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_IR::ComponentDef_tie<T>::ComponentDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::ComponentDef_tie<T>::ComponentDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::ComponentDef_tie<T>::ComponentDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::ComponentDef_tie<T>::ComponentDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -2423,130 +2423,130 @@ POA_IR::ComponentDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::ComponentDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_IR::ComponentDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->ComponentDef::_default_POA (ACE_TRY_ENV);
+  return this->ComponentDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDefSeq * POA_IR::ComponentDef_tie<T>::supported_interfaces  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->supported_interfaces (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ComponentDef_tie<T>::supported_interfaces  (
-    const CORBA_InterfaceDefSeq & supported_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & supported_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->supported_interfaces (
-supported_interfaces,
-    ACE_TRY_ENV
+supported_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::ComponentDef_ptr POA_IR::ComponentDef_tie<T>::base_component  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->base_component (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::ProvidesDefSeq * POA_IR::ComponentDef_tie<T>::provides_interfaces  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->provides_interfaces (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::UsesDefSeq * POA_IR::ComponentDef_tie<T>::uses_interfaces  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->uses_interfaces (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::EmitsDefSeq * POA_IR::ComponentDef_tie<T>::emits_events  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->emits_events (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::PublishesDefSeq * POA_IR::ComponentDef_tie<T>::publishes_events  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->publishes_events (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::ConsumesDefSeq * POA_IR::ComponentDef_tie<T>::consumes_events  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->consumes_events (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::ComponentDef_tie<T>::is_basic  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_basic (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2555,8 +2555,8 @@ IR::ProvidesDef_ptr POA_IR::ComponentDef_tie<T>::create_provides  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_InterfaceDef_ptr interface_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_InterfaceDef_ptr interface_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2566,8 +2566,8 @@ IR::ProvidesDef_ptr POA_IR::ComponentDef_tie<T>::create_provides  (
 id,
     name,
     version,
-    interface_type,
-    ACE_TRY_ENV
+    interface_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2577,8 +2577,8 @@ IR::UsesDef_ptr POA_IR::ComponentDef_tie<T>::create_uses  (
     const char * name,
     const char * version,
     CORBA_InterfaceDef_ptr interface_type,
-    CORBA::Boolean is_multiple,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean is_multiple
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2589,8 +2589,8 @@ id,
     name,
     version,
     interface_type,
-    is_multiple,
-    ACE_TRY_ENV
+    is_multiple
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2599,8 +2599,8 @@ IR::EmitsDef_ptr POA_IR::ComponentDef_tie<T>::create_emits  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr value,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_ValueDef_ptr value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2610,8 +2610,8 @@ IR::EmitsDef_ptr POA_IR::ComponentDef_tie<T>::create_emits  (
 id,
     name,
     version,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2620,8 +2620,8 @@ IR::PublishesDef_ptr POA_IR::ComponentDef_tie<T>::create_publishes  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr value,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_ValueDef_ptr value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2631,8 +2631,8 @@ IR::PublishesDef_ptr POA_IR::ComponentDef_tie<T>::create_publishes  (
 id,
     name,
     version,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2641,8 +2641,8 @@ IR::ConsumesDef_ptr POA_IR::ComponentDef_tie<T>::create_consumes  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr value,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_ValueDef_ptr value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2652,64 +2652,64 @@ IR::ConsumesDef_ptr POA_IR::ComponentDef_tie<T>::create_consumes  (
 id,
     name,
     version,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDefSeq * POA_IR::ComponentDef_tie<T>::base_interfaces  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ComponentDef_tie<T>::base_interfaces  (
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->base_interfaces (
-base_interfaces,
-    ACE_TRY_ENV
+base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::ComponentDef_tie<T>::is_a  (
-    const char * interface_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * interface_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_a (
-interface_id,
-    ACE_TRY_ENV
+interface_id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDef::FullInterfaceDescription * POA_IR::ComponentDef_tie<T>::describe_interface  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2719,8 +2719,8 @@ CORBA_AttributeDef_ptr POA_IR::ComponentDef_tie<T>::create_attribute  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::AttributeMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2731,8 +2731,8 @@ id,
     name,
     version,
     type,
-    mode,
-    ACE_TRY_ENV
+    mode
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2745,8 +2745,8 @@ CORBA_OperationDef_ptr POA_IR::ComponentDef_tie<T>::create_operation  (
     CORBA::OperationMode mode,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2760,31 +2760,31 @@ id,
     mode,
     params,
     exceptions,
-    contexts,
-    ACE_TRY_ENV
+    contexts
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_IR::ComponentDef_tie<T>::lookup  (
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup (
-search_name,
-    ACE_TRY_ENV
+search_name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_IR::ComponentDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2792,8 +2792,8 @@ CORBA_ContainedSeq * POA_IR::ComponentDef_tie<T>::contents  (
 {
   return this->ptr_->contents (
 limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2802,8 +2802,8 @@ CORBA_ContainedSeq * POA_IR::ComponentDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2813,8 +2813,8 @@ CORBA_ContainedSeq * POA_IR::ComponentDef_tie<T>::lookup_name  (
 search_name,
     levels_to_search,
     limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2822,8 +2822,8 @@ template <class T> ACE_INLINE
 CORBA_Container::DescriptionSeq * POA_IR::ComponentDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Long max_returned_objs
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2832,8 +2832,8 @@ CORBA_Container::DescriptionSeq * POA_IR::ComponentDef_tie<T>::describe_contents
   return this->ptr_->describe_contents (
 limit_type,
     exclude_inherited,
-    max_returned_objs,
-    ACE_TRY_ENV
+    max_returned_objs
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2841,8 +2841,8 @@ template <class T> ACE_INLINE
 CORBA_ModuleDef_ptr POA_IR::ComponentDef_tie<T>::create_module  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2851,8 +2851,8 @@ CORBA_ModuleDef_ptr POA_IR::ComponentDef_tie<T>::create_module  (
   return this->ptr_->create_module (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2862,8 +2862,8 @@ CORBA_ConstantDef_ptr POA_IR::ComponentDef_tie<T>::create_constant  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2874,8 +2874,8 @@ id,
     name,
     version,
     type,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2884,8 +2884,8 @@ CORBA_StructDef_ptr POA_IR::ComponentDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2895,8 +2895,8 @@ CORBA_StructDef_ptr POA_IR::ComponentDef_tie<T>::create_struct  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2906,8 +2906,8 @@ CORBA_UnionDef_ptr POA_IR::ComponentDef_tie<T>::create_union  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2918,8 +2918,8 @@ id,
     name,
     version,
     discriminator_type,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2928,8 +2928,8 @@ CORBA_EnumDef_ptr POA_IR::ComponentDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2939,8 +2939,8 @@ CORBA_EnumDef_ptr POA_IR::ComponentDef_tie<T>::create_enum  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2949,8 +2949,8 @@ CORBA_AliasDef_ptr POA_IR::ComponentDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2960,8 +2960,8 @@ CORBA_AliasDef_ptr POA_IR::ComponentDef_tie<T>::create_alias  (
 id,
     name,
     version,
-    original_type,
-    ACE_TRY_ENV
+    original_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2970,8 +2970,8 @@ CORBA_InterfaceDef_ptr POA_IR::ComponentDef_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2981,8 +2981,8 @@ CORBA_InterfaceDef_ptr POA_IR::ComponentDef_tie<T>::create_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2997,8 +2997,8 @@ CORBA_ValueDef_ptr POA_IR::ComponentDef_tie<T>::create_value  (
     CORBA::Boolean is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3014,8 +3014,8 @@ id,
     is_truncatable,
     abstract_base_values,
     supported_interfaces,
-    initializers,
-    ACE_TRY_ENV
+    initializers
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -3024,8 +3024,8 @@ CORBA_ValueBoxDef_ptr POA_IR::ComponentDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3035,8 +3035,8 @@ CORBA_ValueBoxDef_ptr POA_IR::ComponentDef_tie<T>::create_value_box  (
 id,
     name,
     version,
-    original_type_def,
-    ACE_TRY_ENV
+    original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -3045,8 +3045,8 @@ CORBA_ExceptionDef_ptr POA_IR::ComponentDef_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3056,8 +3056,8 @@ CORBA_ExceptionDef_ptr POA_IR::ComponentDef_tie<T>::create_exception  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -3065,8 +3065,8 @@ template <class T> ACE_INLINE
 CORBA_NativeDef_ptr POA_IR::ComponentDef_tie<T>::create_native  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3075,8 +3075,8 @@ CORBA_NativeDef_ptr POA_IR::ComponentDef_tie<T>::create_native  (
   return this->ptr_->create_native (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -3085,8 +3085,8 @@ CORBA_AbstractInterfaceDef_ptr POA_IR::ComponentDef_tie<T>::create_abstract_inte
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3096,8 +3096,8 @@ CORBA_AbstractInterfaceDef_ptr POA_IR::ComponentDef_tie<T>::create_abstract_inte
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -3106,8 +3106,8 @@ CORBA_LocalInterfaceDef_ptr POA_IR::ComponentDef_tie<T>::create_local_interface
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3117,144 +3117,144 @@ CORBA_LocalInterfaceDef_ptr POA_IR::ComponentDef_tie<T>::create_local_interface
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ComponentDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ComponentDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ComponentDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ComponentDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ComponentDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ComponentDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::ComponentDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ComponentDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::ComponentDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::ComponentDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3262,8 +3262,8 @@ template <class T> ACE_INLINE
 void POA_IR::ComponentDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3272,76 +3272,76 @@ void POA_IR::ComponentDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_IR::ComponentDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::ComponentDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ComponentDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_IR::PrimaryKeyDef_tie<T>::PrimaryKeyDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::PrimaryKeyDef_tie<T>::PrimaryKeyDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::PrimaryKeyDef_tie<T>::PrimaryKeyDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::PrimaryKeyDef_tie<T>::PrimaryKeyDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -3385,175 +3385,175 @@ POA_IR::PrimaryKeyDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::PrimaryKeyDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_IR::PrimaryKeyDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->PrimaryKeyDef::_default_POA (ACE_TRY_ENV);
+  return this->PrimaryKeyDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::PrimaryKeyDef_tie<T>::is_a  (
-    const char * primary_key_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * primary_key_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_a (
-primary_key_id,
-    ACE_TRY_ENV
+primary_key_id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ValueDef_ptr POA_IR::PrimaryKeyDef_tie<T>::primary_key  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->primary_key (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::PrimaryKeyDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::PrimaryKeyDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::PrimaryKeyDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::PrimaryKeyDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::PrimaryKeyDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::PrimaryKeyDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::PrimaryKeyDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::PrimaryKeyDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::PrimaryKeyDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::PrimaryKeyDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3561,8 +3561,8 @@ template <class T> ACE_INLINE
 void POA_IR::PrimaryKeyDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3571,63 +3571,63 @@ void POA_IR::PrimaryKeyDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::PrimaryKeyDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::PrimaryKeyDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_IR::FactoryDef_tie<T>::FactoryDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::FactoryDef_tie<T>::FactoryDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::FactoryDef_tie<T>::FactoryDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::FactoryDef_tie<T>::FactoryDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -3671,300 +3671,300 @@ POA_IR::FactoryDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::FactoryDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_IR::FactoryDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->FactoryDef::_default_POA (ACE_TRY_ENV);
+  return this->FactoryDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_IR::FactoryDef_tie<T>::result  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->result (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_IR::FactoryDef_tie<T>::result_def  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->result_def (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::result_def  (
-    CORBA_IDLType_ptr result_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr result_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->result_def (
-result_def,
-    ACE_TRY_ENV
+result_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ParDescriptionSeq * POA_IR::FactoryDef_tie<T>::params  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->params (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::params  (
-    const CORBA_ParDescriptionSeq & params,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ParDescriptionSeq & params
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->params (
-params,
-    ACE_TRY_ENV
+params
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::OperationMode POA_IR::FactoryDef_tie<T>::mode  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->mode (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::mode  (
-    CORBA::OperationMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::OperationMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->mode (
-mode,
-    ACE_TRY_ENV
+mode
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContextIdSeq * POA_IR::FactoryDef_tie<T>::contexts  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->contexts (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::contexts  (
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->contexts (
-contexts,
-    ACE_TRY_ENV
+contexts
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ExceptionDefSeq * POA_IR::FactoryDef_tie<T>::exceptions  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->exceptions (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::exceptions  (
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->exceptions (
-exceptions,
-    ACE_TRY_ENV
+exceptions
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::FactoryDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::FactoryDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::FactoryDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::FactoryDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::FactoryDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::FactoryDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::FactoryDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3972,8 +3972,8 @@ template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3982,63 +3982,63 @@ void POA_IR::FactoryDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::FactoryDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_IR::FinderDef_tie<T>::FinderDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::FinderDef_tie<T>::FinderDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::FinderDef_tie<T>::FinderDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::FinderDef_tie<T>::FinderDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -4082,300 +4082,300 @@ POA_IR::FinderDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::FinderDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_IR::FinderDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->FinderDef::_default_POA (ACE_TRY_ENV);
+  return this->FinderDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_IR::FinderDef_tie<T>::result  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->result (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_IR::FinderDef_tie<T>::result_def  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->result_def (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::result_def  (
-    CORBA_IDLType_ptr result_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr result_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->result_def (
-result_def,
-    ACE_TRY_ENV
+result_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ParDescriptionSeq * POA_IR::FinderDef_tie<T>::params  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->params (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::params  (
-    const CORBA_ParDescriptionSeq & params,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ParDescriptionSeq & params
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->params (
-params,
-    ACE_TRY_ENV
+params
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::OperationMode POA_IR::FinderDef_tie<T>::mode  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->mode (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::mode  (
-    CORBA::OperationMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::OperationMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->mode (
-mode,
-    ACE_TRY_ENV
+mode
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContextIdSeq * POA_IR::FinderDef_tie<T>::contexts  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->contexts (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::contexts  (
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->contexts (
-contexts,
-    ACE_TRY_ENV
+contexts
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ExceptionDefSeq * POA_IR::FinderDef_tie<T>::exceptions  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->exceptions (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::exceptions  (
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->exceptions (
-exceptions,
-    ACE_TRY_ENV
+exceptions
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::FinderDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::FinderDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::FinderDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::FinderDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::FinderDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::FinderDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::FinderDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4383,8 +4383,8 @@ template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4393,63 +4393,63 @@ void POA_IR::FinderDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::FinderDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_IR::HomeDef_tie<T>::HomeDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::HomeDef_tie<T>::HomeDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::HomeDef_tie<T>::HomeDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::HomeDef_tie<T>::HomeDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -4493,89 +4493,89 @@ POA_IR::HomeDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::HomeDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_IR::HomeDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->HomeDef::_default_POA (ACE_TRY_ENV);
+  return this->HomeDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 IR::HomeDef_ptr POA_IR::HomeDef_tie<T>::base_home  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->base_home (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::ComponentDef_ptr POA_IR::HomeDef_tie<T>::managed_component  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->managed_component (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::PrimaryKeyDef_ptr POA_IR::HomeDef_tie<T>::primary_key  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->primary_key (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::FactoryDefSeq * POA_IR::HomeDef_tie<T>::factories  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->factories (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::FinderDefSeq * POA_IR::HomeDef_tie<T>::finders  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->finders (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::HomeDef_tie<T>::is_basic  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_basic (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4584,8 +4584,8 @@ IR::PrimaryKeyDef_ptr POA_IR::HomeDef_tie<T>::create_primary_key  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr primary_key,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_ValueDef_ptr primary_key
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4595,8 +4595,8 @@ IR::PrimaryKeyDef_ptr POA_IR::HomeDef_tie<T>::create_primary_key  (
 id,
     name,
     version,
-    primary_key,
-    ACE_TRY_ENV
+    primary_key
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4606,8 +4606,8 @@ IR::FactoryDef_ptr POA_IR::HomeDef_tie<T>::create_factory  (
     const char * name,
     const char * version,
     const CORBA_ParDescriptionSeq & params,
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4618,8 +4618,8 @@ id,
     name,
     version,
     params,
-    exceptions,
-    ACE_TRY_ENV
+    exceptions
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4629,8 +4629,8 @@ IR::FinderDef_ptr POA_IR::HomeDef_tie<T>::create_finder  (
     const char * name,
     const char * version,
     const CORBA_ParDescriptionSeq & params,
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4641,64 +4641,64 @@ id,
     name,
     version,
     params,
-    exceptions,
-    ACE_TRY_ENV
+    exceptions
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDefSeq * POA_IR::HomeDef_tie<T>::base_interfaces  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::HomeDef_tie<T>::base_interfaces  (
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->base_interfaces (
-base_interfaces,
-    ACE_TRY_ENV
+base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::HomeDef_tie<T>::is_a  (
-    const char * interface_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * interface_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_a (
-interface_id,
-    ACE_TRY_ENV
+interface_id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDef::FullInterfaceDescription * POA_IR::HomeDef_tie<T>::describe_interface  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4708,8 +4708,8 @@ CORBA_AttributeDef_ptr POA_IR::HomeDef_tie<T>::create_attribute  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::AttributeMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4720,8 +4720,8 @@ id,
     name,
     version,
     type,
-    mode,
-    ACE_TRY_ENV
+    mode
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4734,8 +4734,8 @@ CORBA_OperationDef_ptr POA_IR::HomeDef_tie<T>::create_operation  (
     CORBA::OperationMode mode,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4749,31 +4749,31 @@ id,
     mode,
     params,
     exceptions,
-    contexts,
-    ACE_TRY_ENV
+    contexts
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_IR::HomeDef_tie<T>::lookup  (
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup (
-search_name,
-    ACE_TRY_ENV
+search_name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_IR::HomeDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4781,8 +4781,8 @@ CORBA_ContainedSeq * POA_IR::HomeDef_tie<T>::contents  (
 {
   return this->ptr_->contents (
 limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4791,8 +4791,8 @@ CORBA_ContainedSeq * POA_IR::HomeDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4802,8 +4802,8 @@ CORBA_ContainedSeq * POA_IR::HomeDef_tie<T>::lookup_name  (
 search_name,
     levels_to_search,
     limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4811,8 +4811,8 @@ template <class T> ACE_INLINE
 CORBA_Container::DescriptionSeq * POA_IR::HomeDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Long max_returned_objs
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4821,8 +4821,8 @@ CORBA_Container::DescriptionSeq * POA_IR::HomeDef_tie<T>::describe_contents  (
   return this->ptr_->describe_contents (
 limit_type,
     exclude_inherited,
-    max_returned_objs,
-    ACE_TRY_ENV
+    max_returned_objs
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4830,8 +4830,8 @@ template <class T> ACE_INLINE
 CORBA_ModuleDef_ptr POA_IR::HomeDef_tie<T>::create_module  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4840,8 +4840,8 @@ CORBA_ModuleDef_ptr POA_IR::HomeDef_tie<T>::create_module  (
   return this->ptr_->create_module (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4851,8 +4851,8 @@ CORBA_ConstantDef_ptr POA_IR::HomeDef_tie<T>::create_constant  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4863,8 +4863,8 @@ id,
     name,
     version,
     type,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4873,8 +4873,8 @@ CORBA_StructDef_ptr POA_IR::HomeDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4884,8 +4884,8 @@ CORBA_StructDef_ptr POA_IR::HomeDef_tie<T>::create_struct  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4895,8 +4895,8 @@ CORBA_UnionDef_ptr POA_IR::HomeDef_tie<T>::create_union  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4907,8 +4907,8 @@ id,
     name,
     version,
     discriminator_type,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4917,8 +4917,8 @@ CORBA_EnumDef_ptr POA_IR::HomeDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4928,8 +4928,8 @@ CORBA_EnumDef_ptr POA_IR::HomeDef_tie<T>::create_enum  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4938,8 +4938,8 @@ CORBA_AliasDef_ptr POA_IR::HomeDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4949,8 +4949,8 @@ CORBA_AliasDef_ptr POA_IR::HomeDef_tie<T>::create_alias  (
 id,
     name,
     version,
-    original_type,
-    ACE_TRY_ENV
+    original_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4959,8 +4959,8 @@ CORBA_InterfaceDef_ptr POA_IR::HomeDef_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4970,8 +4970,8 @@ CORBA_InterfaceDef_ptr POA_IR::HomeDef_tie<T>::create_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4986,8 +4986,8 @@ CORBA_ValueDef_ptr POA_IR::HomeDef_tie<T>::create_value  (
     CORBA::Boolean is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5003,8 +5003,8 @@ id,
     is_truncatable,
     abstract_base_values,
     supported_interfaces,
-    initializers,
-    ACE_TRY_ENV
+    initializers
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -5013,8 +5013,8 @@ CORBA_ValueBoxDef_ptr POA_IR::HomeDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5024,8 +5024,8 @@ CORBA_ValueBoxDef_ptr POA_IR::HomeDef_tie<T>::create_value_box  (
 id,
     name,
     version,
-    original_type_def,
-    ACE_TRY_ENV
+    original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -5034,8 +5034,8 @@ CORBA_ExceptionDef_ptr POA_IR::HomeDef_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5045,8 +5045,8 @@ CORBA_ExceptionDef_ptr POA_IR::HomeDef_tie<T>::create_exception  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -5054,8 +5054,8 @@ template <class T> ACE_INLINE
 CORBA_NativeDef_ptr POA_IR::HomeDef_tie<T>::create_native  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5064,8 +5064,8 @@ CORBA_NativeDef_ptr POA_IR::HomeDef_tie<T>::create_native  (
   return this->ptr_->create_native (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -5074,8 +5074,8 @@ CORBA_AbstractInterfaceDef_ptr POA_IR::HomeDef_tie<T>::create_abstract_interface
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5085,8 +5085,8 @@ CORBA_AbstractInterfaceDef_ptr POA_IR::HomeDef_tie<T>::create_abstract_interface
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -5095,8 +5095,8 @@ CORBA_LocalInterfaceDef_ptr POA_IR::HomeDef_tie<T>::create_local_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5106,144 +5106,144 @@ CORBA_LocalInterfaceDef_ptr POA_IR::HomeDef_tie<T>::create_local_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::HomeDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::HomeDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::HomeDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::HomeDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::HomeDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::HomeDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::HomeDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::HomeDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::HomeDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::HomeDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5251,8 +5251,8 @@ template <class T> ACE_INLINE
 void POA_IR::HomeDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5261,47 +5261,47 @@ void POA_IR::HomeDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_IR::HomeDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::HomeDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::HomeDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp
index 95f1ac1f017..60601af3a69 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp
@@ -185,36 +185,32 @@ public:
   TAO_ServerRequestInfo_CORBA_FixedDef_digits_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_FixedDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::UShort result);
@@ -231,45 +227,45 @@ private:
 TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::TAO_ServerRequestInfo_CORBA_FixedDef_digits_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_FixedDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_FixedDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -281,7 +277,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::result (CORBA::Environment &ACE
 
 char *
 TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -290,11 +286,11 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -311,36 +307,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_FixedDef *tao_impl
     ,
-    const CORBA::UShort & digits,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::UShort & digits
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -358,8 +350,8 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::TAO_ServerRequestInfo_CORBA_Fix
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_FixedDef *tao_impl,
-    const CORBA::UShort & digits,
-    CORBA::Environment &
+    const CORBA::UShort & digits
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -367,12 +359,12 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::TAO_ServerRequestInfo_CORBA_Fix
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -388,25 +380,25 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::arguments (CORBA::Environment &
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -414,7 +406,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::result (CORBA::Environment &ACE
 
 char *
 TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -423,11 +415,11 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_FixedDef_scale_get : public TAO_ServerRequestInfo
@@ -436,36 +428,32 @@ public:
   TAO_ServerRequestInfo_CORBA_FixedDef_scale_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_FixedDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Short result);
@@ -482,45 +470,45 @@ private:
 TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::TAO_ServerRequestInfo_CORBA_FixedDef_scale_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_FixedDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_FixedDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -532,7 +520,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::result (CORBA::Environment &ACE_
 
 char *
 TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -541,11 +529,11 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -562,36 +550,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_FixedDef *tao_impl
     ,
-    const CORBA::Short & scale,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::Short & scale
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -609,8 +593,8 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::TAO_ServerRequestInfo_CORBA_Fixe
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_FixedDef *tao_impl,
-    const CORBA::Short & scale,
-    CORBA::Environment &
+    const CORBA::Short & scale
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -618,12 +602,12 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::TAO_ServerRequestInfo_CORBA_Fixe
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -639,25 +623,25 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::arguments (CORBA::Environment &A
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -665,7 +649,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::result (CORBA::Environment &ACE_
 
 char *
 TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -674,11 +658,11 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -710,18 +694,18 @@ _TAO_CORBA_FixedDef_Strategized_Proxy_Broker::~_TAO_CORBA_FixedDef_Strategized_P
 
 _TAO_CORBA_FixedDef_Proxy_Impl&
 _TAO_CORBA_FixedDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_FixedDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_FixedDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -730,8 +714,8 @@ _TAO_CORBA_FixedDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_FixedDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -800,8 +784,8 @@ _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::_TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl (
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::UShort _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -816,8 +800,8 @@ CORBA::UShort _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "digits",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -826,14 +810,14 @@ CORBA::UShort _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits (
           "IDL:omg.org/CORBA/FixedDef:1.0"
         )
     )->digits (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::UShort digits,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::UShort digits
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -846,8 +830,8 @@ void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "digits",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -856,15 +840,15 @@ void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits (
           "IDL:omg.org/CORBA/FixedDef:1.0"
         )
     )->digits (
-        digits,
-        ACE_TRY_ENV
+        digits
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::Short _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -879,8 +863,8 @@ CORBA::Short _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "scale",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -889,14 +873,14 @@ CORBA::Short _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale (
           "IDL:omg.org/CORBA/FixedDef:1.0"
         )
     )->scale (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::Short scale,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Short scale
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -909,8 +893,8 @@ void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "scale",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -919,8 +903,8 @@ void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale (
           "IDL:omg.org/CORBA/FixedDef:1.0"
         )
     )->scale (
-        scale,
-        ACE_TRY_ENV
+        scale
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -950,8 +934,8 @@ POA_CORBA_FixedDef::~POA_CORBA_FixedDef (void)
 void POA_CORBA_FixedDef::_get_digits_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_FixedDef *_tao_impl =
@@ -971,19 +955,19 @@ void POA_CORBA_FixedDef::_get_digits_skel (
   TAO_ServerRequestInfo_CORBA_FixedDef_digits_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->digits (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -991,20 +975,20 @@ void POA_CORBA_FixedDef::_get_digits_skel (
       CORBA::UShort _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1026,16 +1010,13 @@ void POA_CORBA_FixedDef::_get_digits_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_FixedDef::_set_digits_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -1063,39 +1044,39 @@ void POA_CORBA_FixedDef::_set_digits_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      digits,
-      ACE_TRY_ENV
+      digits
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->digits (
-          digits,
-          ACE_TRY_ENV
+          digits
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1110,16 +1091,13 @@ void POA_CORBA_FixedDef::_set_digits_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_FixedDef::_get_scale_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_FixedDef *_tao_impl =
@@ -1139,19 +1117,19 @@ void POA_CORBA_FixedDef::_get_scale_skel (
   TAO_ServerRequestInfo_CORBA_FixedDef_scale_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->scale (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -1159,20 +1137,20 @@ void POA_CORBA_FixedDef::_get_scale_skel (
       CORBA::Short _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1194,16 +1172,13 @@ void POA_CORBA_FixedDef::_get_scale_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_FixedDef::_set_scale_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -1231,39 +1206,39 @@ void POA_CORBA_FixedDef::_set_scale_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      scale,
-      ACE_TRY_ENV
+      scale
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->scale (
-          scale,
-          ACE_TRY_ENV
+          scale
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1278,16 +1253,13 @@ void POA_CORBA_FixedDef::_set_scale_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_FixedDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -1297,7 +1269,7 @@ void POA_CORBA_FixedDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -1309,12 +1281,12 @@ void POA_CORBA_FixedDef::_is_a_skel (
 void POA_CORBA_FixedDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_FixedDef *_tao_impl = (POA_CORBA_FixedDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -1326,8 +1298,8 @@ void POA_CORBA_FixedDef::_non_existent_skel (
 void POA_CORBA_FixedDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_FixedDef *_tao_impl = (POA_CORBA_FixedDef *) _tao_object_reference;
@@ -1346,7 +1318,7 @@ void POA_CORBA_FixedDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -1372,11 +1344,11 @@ void POA_CORBA_FixedDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_FixedDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -1404,12 +1376,12 @@ void* POA_CORBA_FixedDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_FixedDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_FixedDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -1419,9 +1391,9 @@ const char* POA_CORBA_FixedDef::_interface_repository_id (void) const
 }
 
 CORBA_FixedDef*
-POA_CORBA_FixedDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_FixedDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -1591,36 +1563,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -1637,45 +1605,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ValueMemberDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ValueMemberDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1687,7 +1655,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1696,11 +1664,11 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::target_most_derived_interfa
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1716,36 +1684,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_IDLType_ptr result);
@@ -1762,45 +1726,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ValueMemberDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ValueMemberDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1812,7 +1776,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::result (CORBA::Environm
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1821,11 +1785,11 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::target_most_derived_int
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1842,36 +1806,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl
     ,
-    CORBA_IDLType_ptr type_def,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_IDLType_ptr type_def
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -1889,8 +1849,8 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::TAO_ServerRequestInfo_C
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueMemberDef *tao_impl,
-    CORBA_IDLType_ptr type_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr type_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1898,12 +1858,12 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::TAO_ServerRequestInfo_C
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1919,25 +1879,25 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (CORBA::Envir
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -1945,7 +1905,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::result (CORBA::Environm
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1954,11 +1914,11 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::target_most_derived_int
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get : public TAO_ServerRequestInfo
@@ -1967,36 +1927,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Visibility result);
@@ -2013,45 +1969,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ValueMemberDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ValueMemberDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -2063,7 +2019,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2072,11 +2028,11 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -2093,36 +2049,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl
     ,
-    const CORBA::Visibility & access,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::Visibility & access
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -2140,8 +2092,8 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::TAO_ServerRequestInfo_COR
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueMemberDef *tao_impl,
-    const CORBA::Visibility & access,
-    CORBA::Environment &
+    const CORBA::Visibility & access
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -2149,12 +2101,12 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::TAO_ServerRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -2170,25 +2122,25 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -2196,7 +2148,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2205,11 +2157,11 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -2241,18 +2193,18 @@ _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::~_TAO_CORBA_ValueMemberDef_S
 
 _TAO_CORBA_ValueMemberDef_Proxy_Impl&
 _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_ValueMemberDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_ValueMemberDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -2261,8 +2213,8 @@ _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -2331,8 +2283,8 @@ _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ValueMemberDef_ThruPOA_
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2347,8 +2299,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "type",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2357,13 +2309,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type (
           "IDL:omg.org/CORBA/ValueMemberDef:1.0"
         )
     )->type (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2378,8 +2330,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2388,14 +2340,14 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
           "IDL:omg.org/CORBA/ValueMemberDef:1.0"
         )
     )->type_def (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA_IDLType_ptr type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2408,8 +2360,8 @@ void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2418,15 +2370,15 @@ void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
           "IDL:omg.org/CORBA/ValueMemberDef:1.0"
         )
     )->type_def (
-        type_def,
-        ACE_TRY_ENV
+        type_def
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::Visibility _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2441,8 +2393,8 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "access",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -2451,14 +2403,14 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access (
           "IDL:omg.org/CORBA/ValueMemberDef:1.0"
         )
     )->access (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::Visibility access,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Visibility access
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2471,8 +2423,8 @@ void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "access",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2481,8 +2433,8 @@ void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access (
           "IDL:omg.org/CORBA/ValueMemberDef:1.0"
         )
     )->access (
-        access,
-        ACE_TRY_ENV
+        access
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -2512,8 +2464,8 @@ POA_CORBA_ValueMemberDef::~POA_CORBA_ValueMemberDef (void)
 void POA_CORBA_ValueMemberDef::_get_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueMemberDef *_tao_impl =
@@ -2533,19 +2485,19 @@ void POA_CORBA_ValueMemberDef::_get_type_skel (
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->type (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2554,20 +2506,20 @@ void POA_CORBA_ValueMemberDef::_get_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2589,16 +2541,13 @@ void POA_CORBA_ValueMemberDef::_get_type_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueMemberDef::_get_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueMemberDef *_tao_impl =
@@ -2618,19 +2567,19 @@ void POA_CORBA_ValueMemberDef::_get_type_def_skel (
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->type_def (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2639,20 +2588,20 @@ void POA_CORBA_ValueMemberDef::_get_type_def_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2674,16 +2623,13 @@ void POA_CORBA_ValueMemberDef::_get_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueMemberDef::_set_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2711,39 +2657,39 @@ void POA_CORBA_ValueMemberDef::_set_type_def_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      type_def.in (),
-      ACE_TRY_ENV
+      type_def.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->type_def (
-          type_def.in (),
-          ACE_TRY_ENV
+          type_def.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2758,16 +2704,13 @@ void POA_CORBA_ValueMemberDef::_set_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueMemberDef::_get_access_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueMemberDef *_tao_impl =
@@ -2787,19 +2730,19 @@ void POA_CORBA_ValueMemberDef::_get_access_skel (
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->access (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2807,20 +2750,20 @@ void POA_CORBA_ValueMemberDef::_get_access_skel (
       CORBA::Visibility _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2842,16 +2785,13 @@ void POA_CORBA_ValueMemberDef::_get_access_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueMemberDef::_set_access_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2879,39 +2819,39 @@ void POA_CORBA_ValueMemberDef::_set_access_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      access,
-      ACE_TRY_ENV
+      access
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->access (
-          access,
-          ACE_TRY_ENV
+          access
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2926,16 +2866,13 @@ void POA_CORBA_ValueMemberDef::_set_access_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueMemberDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2945,7 +2882,7 @@ void POA_CORBA_ValueMemberDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -2957,12 +2894,12 @@ void POA_CORBA_ValueMemberDef::_is_a_skel (
 void POA_CORBA_ValueMemberDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueMemberDef *_tao_impl = (POA_CORBA_ValueMemberDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -2974,8 +2911,8 @@ void POA_CORBA_ValueMemberDef::_non_existent_skel (
 void POA_CORBA_ValueMemberDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueMemberDef *_tao_impl = (POA_CORBA_ValueMemberDef *) _tao_object_reference;
@@ -2994,7 +2931,7 @@ void POA_CORBA_ValueMemberDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -3020,11 +2957,11 @@ void POA_CORBA_ValueMemberDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_ValueMemberDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -3052,12 +2989,12 @@ void* POA_CORBA_ValueMemberDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_ValueMemberDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_ValueMemberDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -3067,9 +3004,9 @@ const char* POA_CORBA_ValueMemberDef::_interface_repository_id (void) const
 }
 
 CORBA_ValueMemberDef*
-POA_CORBA_ValueMemberDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_ValueMemberDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -3275,36 +3212,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_InterfaceDefSeq * result);
@@ -3321,45 +3254,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ValueDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ValueDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -3371,7 +3304,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (CORBA::En
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3380,11 +3313,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::target_most_deriv
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -3401,36 +3334,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
     ,
-    const CORBA_InterfaceDefSeq & supported_interfaces,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_InterfaceDefSeq & supported_interfaces
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -3448,8 +3377,8 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::TAO_ServerRequest
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl,
-    const CORBA_InterfaceDefSeq & supported_interfaces,
-    CORBA::Environment &
+    const CORBA_InterfaceDefSeq & supported_interfaces
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -3457,12 +3386,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::TAO_ServerRequest
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -3478,25 +3407,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (CORBA:
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -3504,7 +3433,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (CORBA::En
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3513,11 +3442,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::target_most_deriv
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get : public TAO_ServerRequestInfo
@@ -3526,36 +3455,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_InitializerSeq * result);
@@ -3572,45 +3497,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ValueDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ValueDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -3622,7 +3547,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3631,11 +3556,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -3652,36 +3577,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
     ,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -3699,8 +3620,8 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::TAO_ServerRequestInfo_COR
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -3708,12 +3629,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::TAO_ServerRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -3729,25 +3650,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -3755,7 +3676,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3764,11 +3685,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get : public TAO_ServerRequestInfo
@@ -3777,36 +3698,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ValueDef_ptr result);
@@ -3823,45 +3740,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ValueDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ValueDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -3873,7 +3790,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3882,11 +3799,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::target_most_derived_interfa
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -3903,36 +3820,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
     ,
-    CORBA_ValueDef_ptr base_value,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_ValueDef_ptr base_value
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -3950,8 +3863,8 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::TAO_ServerRequestInfo_CORBA
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl,
-    CORBA_ValueDef_ptr base_value,
-    CORBA::Environment &
+    CORBA_ValueDef_ptr base_value
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -3959,12 +3872,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::TAO_ServerRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -3980,25 +3893,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::arguments (CORBA::Environme
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -4006,7 +3919,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4015,11 +3928,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::target_most_derived_interfa
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get : public TAO_ServerRequestInfo
@@ -4028,36 +3941,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ValueDefSeq * result);
@@ -4074,45 +3983,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ValueDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ValueDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4124,7 +4033,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (CORBA::En
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4133,11 +4042,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::target_most_deriv
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4154,36 +4063,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
     ,
-    const CORBA_ValueDefSeq & abstract_base_values,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_ValueDefSeq & abstract_base_values
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -4201,8 +4106,8 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::TAO_ServerRequest
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl,
-    const CORBA_ValueDefSeq & abstract_base_values,
-    CORBA::Environment &
+    const CORBA_ValueDefSeq & abstract_base_values
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4210,12 +4115,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::TAO_ServerRequest
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4231,25 +4136,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (CORBA:
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -4257,7 +4162,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (CORBA::En
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4266,11 +4171,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::target_most_deriv
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get : public TAO_ServerRequestInfo
@@ -4279,36 +4184,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -4325,45 +4226,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ValueDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ValueDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4375,7 +4276,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4384,11 +4285,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::target_most_derived_interf
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4405,36 +4306,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
     ,
-    const CORBA::Boolean & is_abstract,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::Boolean & is_abstract
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -4452,8 +4349,8 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::TAO_ServerRequestInfo_CORB
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl,
-    const CORBA::Boolean & is_abstract,
-    CORBA::Environment &
+    const CORBA::Boolean & is_abstract
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4461,12 +4358,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::TAO_ServerRequestInfo_CORB
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4482,25 +4379,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (CORBA::Environm
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -4508,7 +4405,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4517,11 +4414,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::target_most_derived_interf
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get : public TAO_ServerRequestInfo
@@ -4530,36 +4427,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -4576,45 +4469,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ValueDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ValueDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4626,7 +4519,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::result (CORBA::Environment &
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4635,11 +4528,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::target_most_derived_interfac
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4656,36 +4549,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
     ,
-    const CORBA::Boolean & is_custom,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::Boolean & is_custom
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -4703,8 +4592,8 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::TAO_ServerRequestInfo_CORBA_
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl,
-    const CORBA::Boolean & is_custom,
-    CORBA::Environment &
+    const CORBA::Boolean & is_custom
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4712,12 +4601,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::TAO_ServerRequestInfo_CORBA_
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4733,25 +4622,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::arguments (CORBA::Environmen
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -4759,7 +4648,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::result (CORBA::Environment &
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4768,11 +4657,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::target_most_derived_interfac
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get : public TAO_ServerRequestInfo
@@ -4781,36 +4670,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -4827,45 +4712,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ValueDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ValueDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4877,7 +4762,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::result (CORBA::Environm
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4886,11 +4771,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::target_most_derived_int
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4907,36 +4792,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
     ,
-    const CORBA::Boolean & is_truncatable,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::Boolean & is_truncatable
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -4954,8 +4835,8 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::TAO_ServerRequestInfo_C
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl,
-    const CORBA::Boolean & is_truncatable,
-    CORBA::Environment &
+    const CORBA::Boolean & is_truncatable
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4963,12 +4844,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::TAO_ServerRequestInfo_C
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4984,25 +4865,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (CORBA::Envir
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -5010,7 +4891,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::result (CORBA::Environm
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5019,11 +4900,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::target_most_derived_int
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_is_a : public TAO_ServerRequestInfo
@@ -5033,36 +4914,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
     ,
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * id
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -5081,8 +4958,8 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::TAO_ServerRequestInfo_CORBA_ValueDef_
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl,
-    const char * id,
-    CORBA::Environment &
+    const char * id
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5090,12 +4967,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::TAO_ServerRequestInfo_CORBA_ValueDef_
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5111,25 +4988,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::arguments (CORBA::Environment &ACE_TR
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5141,7 +5018,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::result (CORBA::Environment &ACE_TRY_E
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_is_a::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5150,11 +5027,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_is_a::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5170,36 +5047,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ValueDef_describe_value (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ValueDef::FullValueDescription * result);
@@ -5216,45 +5089,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::TAO_ServerRequestInfo_CORBA_ValueDef_describe_value (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ValueDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ValueDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5266,7 +5139,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5275,11 +5148,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::target_most_derived_interfa
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5300,36 +5173,32 @@ public:
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Visibility & access,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::Visibility & access
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ValueMemberDef_ptr result);
@@ -5356,8 +5225,8 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::TAO_ServerRequestInfo_
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Visibility & access,
-    CORBA::Environment &
+    const CORBA::Visibility & access
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5369,12 +5238,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::TAO_ServerRequestInfo_
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5402,25 +5271,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::arguments (CORBA::Envi
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5432,7 +5301,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::result (CORBA::Environ
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5441,11 +5310,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::target_most_derived_in
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5466,36 +5335,32 @@ public:
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode & mode,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA::AttributeMode & mode
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_AttributeDef_ptr result);
@@ -5522,8 +5387,8 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::TAO_ServerRequestInfo_COR
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode & mode,
-    CORBA::Environment &
+    CORBA::AttributeMode & mode
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5535,12 +5400,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::TAO_ServerRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5568,25 +5433,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5598,7 +5463,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5607,11 +5472,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5635,36 +5500,32 @@ public:
     CORBA::OperationMode & mode,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_OperationDef_ptr result);
@@ -5697,8 +5558,8 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::TAO_ServerRequestInfo_COR
     CORBA::OperationMode & mode,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5713,12 +5574,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::TAO_ServerRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5755,25 +5616,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5785,7 +5646,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5794,11 +5655,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5837,18 +5698,18 @@ _TAO_CORBA_ValueDef_Strategized_Proxy_Broker::~_TAO_CORBA_ValueDef_Strategized_P
 
 _TAO_CORBA_ValueDef_Proxy_Impl&
 _TAO_CORBA_ValueDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_ValueDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_ValueDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -5857,8 +5718,8 @@ _TAO_CORBA_ValueDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_ValueDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -5927,8 +5788,8 @@ _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl (
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5943,8 +5804,8 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interf
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "supported_interfaces",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -5953,14 +5814,14 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interf
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->supported_interfaces (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA_InterfaceDefSeq & supported_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & supported_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5973,8 +5834,8 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "supported_interfaces",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -5983,15 +5844,15 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->supported_interfaces (
-        supported_interfaces,
-        ACE_TRY_ENV
+        supported_interfaces
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA_InitializerSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6006,8 +5867,8 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "initializers",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6016,14 +5877,14 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->initializers (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6036,8 +5897,8 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "initializers",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -6046,15 +5907,15 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->initializers (
-        initializers,
-        ACE_TRY_ENV
+        initializers
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6069,8 +5930,8 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "base_value",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6079,14 +5940,14 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->base_value (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value (
     CORBA_Object *_collocated_tao_target_,
-    CORBA_ValueDef_ptr base_value,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_ValueDef_ptr base_value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6099,8 +5960,8 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "base_value",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -6109,15 +5970,15 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->base_value (
-        base_value,
-        ACE_TRY_ENV
+        base_value
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6132,8 +5993,8 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "abstract_base_values",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6142,14 +6003,14 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->abstract_base_values (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA_ValueDefSeq & abstract_base_values,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ValueDefSeq & abstract_base_values
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6162,8 +6023,8 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "abstract_base_values",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -6172,15 +6033,15 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->abstract_base_values (
-        abstract_base_values,
-        ACE_TRY_ENV
+        abstract_base_values
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6195,8 +6056,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "is_abstract",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -6205,14 +6066,14 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_abstract (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::Boolean is_abstract,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean is_abstract
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6225,8 +6086,8 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "is_abstract",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -6235,15 +6096,15 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_abstract (
-        is_abstract,
-        ACE_TRY_ENV
+        is_abstract
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6258,8 +6119,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "is_custom",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -6268,14 +6129,14 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_custom (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::Boolean is_custom,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean is_custom
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6288,8 +6149,8 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "is_custom",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -6298,15 +6159,15 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_custom (
-        is_custom,
-        ACE_TRY_ENV
+        is_custom
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6321,8 +6182,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "is_truncatable",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -6331,14 +6192,14 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_truncatable (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::Boolean is_truncatable,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean is_truncatable
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6351,8 +6212,8 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "is_truncatable",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -6361,16 +6222,16 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_truncatable (
-        is_truncatable,
-        ACE_TRY_ENV
+        is_truncatable
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_a (
     CORBA_Object *_collocated_tao_target_,
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6385,8 +6246,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_a (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "is_a",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -6395,14 +6256,14 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_a (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_a (
-        id,
-        ACE_TRY_ENV
+        id
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::describe_value (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6417,8 +6278,8 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::d
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "describe_value",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6427,7 +6288,7 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::d
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->describe_value (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -6437,8 +6298,8 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_value_me
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    CORBA::Visibility access,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Visibility access
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6453,8 +6314,8 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_value_me
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_value_member",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6467,8 +6328,8 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_value_me
         name,
         version,
         type,
-        access,
-        ACE_TRY_ENV
+        access
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -6478,8 +6339,8 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_attribute
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::AttributeMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6494,8 +6355,8 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_attribute
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_attribute",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6508,8 +6369,8 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_attribute
         name,
         version,
         type,
-        mode,
-        ACE_TRY_ENV
+        mode
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -6522,8 +6383,8 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_operation
     CORBA::OperationMode mode,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6538,8 +6399,8 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_operation
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_operation",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6555,8 +6416,8 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_operation
         mode,
         params,
         exceptions,
-        contexts,
-        ACE_TRY_ENV
+        contexts
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -6587,8 +6448,8 @@ POA_CORBA_ValueDef::~POA_CORBA_ValueDef (void)
 void POA_CORBA_ValueDef::_get_supported_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl =
@@ -6608,19 +6469,19 @@ void POA_CORBA_ValueDef::_get_supported_interfaces_skel (
   TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->supported_interfaces (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -6629,20 +6490,20 @@ void POA_CORBA_ValueDef::_get_supported_interfaces_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6664,16 +6525,13 @@ void POA_CORBA_ValueDef::_get_supported_interfaces_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::_set_supported_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -6701,39 +6559,39 @@ void POA_CORBA_ValueDef::_set_supported_interfaces_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      supported_interfaces,
-      ACE_TRY_ENV
+      supported_interfaces
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->supported_interfaces (
-          supported_interfaces,
-          ACE_TRY_ENV
+          supported_interfaces
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6748,16 +6606,13 @@ void POA_CORBA_ValueDef::_set_supported_interfaces_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::_get_initializers_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl =
@@ -6777,19 +6632,19 @@ void POA_CORBA_ValueDef::_get_initializers_skel (
   TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->initializers (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -6798,20 +6653,20 @@ void POA_CORBA_ValueDef::_get_initializers_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6833,16 +6688,13 @@ void POA_CORBA_ValueDef::_get_initializers_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::_set_initializers_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -6870,39 +6722,39 @@ void POA_CORBA_ValueDef::_set_initializers_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      initializers,
-      ACE_TRY_ENV
+      initializers
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->initializers (
-          initializers,
-          ACE_TRY_ENV
+          initializers
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6917,16 +6769,13 @@ void POA_CORBA_ValueDef::_set_initializers_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::_get_base_value_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl =
@@ -6946,19 +6795,19 @@ void POA_CORBA_ValueDef::_get_base_value_skel (
   TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->base_value (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -6967,20 +6816,20 @@ void POA_CORBA_ValueDef::_get_base_value_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7002,16 +6851,13 @@ void POA_CORBA_ValueDef::_get_base_value_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::_set_base_value_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7039,39 +6885,39 @@ void POA_CORBA_ValueDef::_set_base_value_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      base_value.in (),
-      ACE_TRY_ENV
+      base_value.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->base_value (
-          base_value.in (),
-          ACE_TRY_ENV
+          base_value.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7086,16 +6932,13 @@ void POA_CORBA_ValueDef::_set_base_value_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::_get_abstract_base_values_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl =
@@ -7115,19 +6958,19 @@ void POA_CORBA_ValueDef::_get_abstract_base_values_skel (
   TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->abstract_base_values (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7136,20 +6979,20 @@ void POA_CORBA_ValueDef::_get_abstract_base_values_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7171,16 +7014,13 @@ void POA_CORBA_ValueDef::_get_abstract_base_values_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::_set_abstract_base_values_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7208,39 +7048,39 @@ void POA_CORBA_ValueDef::_set_abstract_base_values_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      abstract_base_values,
-      ACE_TRY_ENV
+      abstract_base_values
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->abstract_base_values (
-          abstract_base_values,
-          ACE_TRY_ENV
+          abstract_base_values
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7255,16 +7095,13 @@ void POA_CORBA_ValueDef::_set_abstract_base_values_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::_get_is_abstract_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl =
@@ -7284,19 +7121,19 @@ void POA_CORBA_ValueDef::_get_is_abstract_skel (
   TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_abstract (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7304,20 +7141,20 @@ void POA_CORBA_ValueDef::_get_is_abstract_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7339,16 +7176,13 @@ void POA_CORBA_ValueDef::_get_is_abstract_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::_set_is_abstract_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7376,39 +7210,39 @@ void POA_CORBA_ValueDef::_set_is_abstract_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      is_abstract,
-      ACE_TRY_ENV
+      is_abstract
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->is_abstract (
-          is_abstract,
-          ACE_TRY_ENV
+          is_abstract
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7423,16 +7257,13 @@ void POA_CORBA_ValueDef::_set_is_abstract_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::_get_is_custom_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl =
@@ -7452,19 +7283,19 @@ void POA_CORBA_ValueDef::_get_is_custom_skel (
   TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_custom (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7472,20 +7303,20 @@ void POA_CORBA_ValueDef::_get_is_custom_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7507,16 +7338,13 @@ void POA_CORBA_ValueDef::_get_is_custom_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::_set_is_custom_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7544,39 +7372,39 @@ void POA_CORBA_ValueDef::_set_is_custom_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      is_custom,
-      ACE_TRY_ENV
+      is_custom
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->is_custom (
-          is_custom,
-          ACE_TRY_ENV
+          is_custom
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7591,16 +7419,13 @@ void POA_CORBA_ValueDef::_set_is_custom_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::_get_is_truncatable_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl =
@@ -7620,19 +7445,19 @@ void POA_CORBA_ValueDef::_get_is_truncatable_skel (
   TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_truncatable (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7640,20 +7465,20 @@ void POA_CORBA_ValueDef::_get_is_truncatable_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7675,16 +7500,13 @@ void POA_CORBA_ValueDef::_get_is_truncatable_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::_set_is_truncatable_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7712,39 +7534,39 @@ void POA_CORBA_ValueDef::_set_is_truncatable_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      is_truncatable,
-      ACE_TRY_ENV
+      is_truncatable
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->is_truncatable (
-          is_truncatable,
-          ACE_TRY_ENV
+          is_truncatable
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7759,16 +7581,13 @@ void POA_CORBA_ValueDef::_set_is_truncatable_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7796,20 +7615,20 @@ void POA_CORBA_ValueDef::is_a_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      id.in (),
-      ACE_TRY_ENV
+      id.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_a (
-          id.in (),
-          ACE_TRY_ENV
+          id.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7817,20 +7636,20 @@ void POA_CORBA_ValueDef::is_a_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7852,16 +7671,13 @@ void POA_CORBA_ValueDef::is_a_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::describe_value_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl =
@@ -7881,19 +7697,19 @@ void POA_CORBA_ValueDef::describe_value_skel (
   TAO_ServerRequestInfo_CORBA_ValueDef_describe_value ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->describe_value (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7902,20 +7718,20 @@ void POA_CORBA_ValueDef::describe_value_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7937,16 +7753,13 @@ void POA_CORBA_ValueDef::describe_value_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::create_value_member_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7986,13 +7799,13 @@ void POA_CORBA_ValueDef::create_value_member_skel (
       name.in (),
       version.in (),
       type.in (),
-      access,
-      ACE_TRY_ENV
+      access
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8002,8 +7815,8 @@ void POA_CORBA_ValueDef::create_value_member_skel (
           name.in (),
           version.in (),
           type.in (),
-          access,
-          ACE_TRY_ENV
+          access
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8012,20 +7825,20 @@ void POA_CORBA_ValueDef::create_value_member_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8047,16 +7860,13 @@ void POA_CORBA_ValueDef::create_value_member_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::create_attribute_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8096,13 +7906,13 @@ void POA_CORBA_ValueDef::create_attribute_skel (
       name.in (),
       version.in (),
       type.in (),
-      mode,
-      ACE_TRY_ENV
+      mode
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8112,8 +7922,8 @@ void POA_CORBA_ValueDef::create_attribute_skel (
           name.in (),
           version.in (),
           type.in (),
-          mode,
-          ACE_TRY_ENV
+          mode
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8122,20 +7932,20 @@ void POA_CORBA_ValueDef::create_attribute_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8157,16 +7967,13 @@ void POA_CORBA_ValueDef::create_attribute_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::create_operation_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8215,13 +8022,13 @@ void POA_CORBA_ValueDef::create_operation_skel (
       mode,
       params,
       exceptions,
-      contexts,
-      ACE_TRY_ENV
+      contexts
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8234,8 +8041,8 @@ void POA_CORBA_ValueDef::create_operation_skel (
           mode,
           params,
           exceptions,
-          contexts,
-          ACE_TRY_ENV
+          contexts
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8244,20 +8051,20 @@ void POA_CORBA_ValueDef::create_operation_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8279,16 +8086,13 @@ void POA_CORBA_ValueDef::create_operation_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8298,7 +8102,7 @@ void POA_CORBA_ValueDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -8310,12 +8114,12 @@ void POA_CORBA_ValueDef::_is_a_skel (
 void POA_CORBA_ValueDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -8327,8 +8131,8 @@ void POA_CORBA_ValueDef::_non_existent_skel (
 void POA_CORBA_ValueDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *) _tao_object_reference;
@@ -8347,7 +8151,7 @@ void POA_CORBA_ValueDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -8373,11 +8177,11 @@ void POA_CORBA_ValueDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_ValueDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -8411,12 +8215,12 @@ void* POA_CORBA_ValueDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_ValueDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_ValueDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -8426,9 +8230,9 @@ const char* POA_CORBA_ValueDef::_interface_repository_id (void) const
 }
 
 CORBA_ValueDef*
-POA_CORBA_ValueDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_ValueDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -8596,36 +8400,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueBoxDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_IDLType_ptr result);
@@ -8642,45 +8442,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ValueBoxDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ValueBoxDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -8692,7 +8492,7 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (CORBA::En
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -8701,11 +8501,11 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::target_most_deriv
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -8722,36 +8522,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueBoxDef *tao_impl
     ,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -8769,8 +8565,8 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::TAO_ServerRequest
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueBoxDef *tao_impl,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -8778,12 +8574,12 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::TAO_ServerRequest
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -8799,25 +8595,25 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (CORBA:
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -8825,7 +8621,7 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (CORBA::En
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -8834,11 +8630,11 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::target_most_deriv
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8870,18 +8666,18 @@ _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::~_TAO_CORBA_ValueBoxDef_Strateg
 
 _TAO_CORBA_ValueBoxDef_Proxy_Impl&
 _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_ValueBoxDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_ValueBoxDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -8890,8 +8686,8 @@ _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -8960,8 +8756,8 @@ _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -8976,8 +8772,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "original_type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -8986,14 +8782,14 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
           "IDL:omg.org/CORBA/ValueBoxDef:1.0"
         )
     )->original_type_def (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -9006,8 +8802,8 @@ void _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "original_type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -9016,8 +8812,8 @@ void _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
           "IDL:omg.org/CORBA/ValueBoxDef:1.0"
         )
     )->original_type_def (
-        original_type_def,
-        ACE_TRY_ENV
+        original_type_def
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -9049,8 +8845,8 @@ POA_CORBA_ValueBoxDef::~POA_CORBA_ValueBoxDef (void)
 void POA_CORBA_ValueBoxDef::_get_original_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueBoxDef *_tao_impl =
@@ -9070,19 +8866,19 @@ void POA_CORBA_ValueBoxDef::_get_original_type_def_skel (
   TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->original_type_def (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -9091,20 +8887,20 @@ void POA_CORBA_ValueBoxDef::_get_original_type_def_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9126,16 +8922,13 @@ void POA_CORBA_ValueBoxDef::_get_original_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueBoxDef::_set_original_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9163,39 +8956,39 @@ void POA_CORBA_ValueBoxDef::_set_original_type_def_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      original_type_def.in (),
-      ACE_TRY_ENV
+      original_type_def.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->original_type_def (
-          original_type_def.in (),
-          ACE_TRY_ENV
+          original_type_def.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9210,16 +9003,13 @@ void POA_CORBA_ValueBoxDef::_set_original_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueBoxDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9229,7 +9019,7 @@ void POA_CORBA_ValueBoxDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9241,12 +9031,12 @@ void POA_CORBA_ValueBoxDef::_is_a_skel (
 void POA_CORBA_ValueBoxDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueBoxDef *_tao_impl = (POA_CORBA_ValueBoxDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9258,8 +9048,8 @@ void POA_CORBA_ValueBoxDef::_non_existent_skel (
 void POA_CORBA_ValueBoxDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueBoxDef *_tao_impl = (POA_CORBA_ValueBoxDef *) _tao_object_reference;
@@ -9278,7 +9068,7 @@ void POA_CORBA_ValueBoxDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -9304,11 +9094,11 @@ void POA_CORBA_ValueBoxDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_ValueBoxDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -9342,12 +9132,12 @@ void* POA_CORBA_ValueBoxDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_ValueBoxDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_ValueBoxDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -9357,9 +9147,9 @@ const char* POA_CORBA_ValueBoxDef::_interface_repository_id (void) const
 }
 
 CORBA_ValueBoxDef*
-POA_CORBA_ValueBoxDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_ValueBoxDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h
index 70c12c62795..44ebf1426b3 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h
@@ -64,10 +64,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -76,141 +75,133 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_FixedDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::UShort digits (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_digits_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void digits (
-      CORBA::UShort digits,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::UShort digits
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_digits_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA::Short scale (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_scale_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void scale (
-      CORBA::Short scale,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Short scale
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_scale_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_FixedDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_FixedDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_FixedDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_FixedDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_FixedDef_Proxy_Impl &select_proxy (
-    ::CORBA_FixedDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_FixedDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -218,18 +209,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_FixedDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -241,7 +232,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -249,52 +240,52 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_FixedDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::UShort digits (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void digits (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::UShort digits,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::UShort digits
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA::Short scale (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void scale (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::Short scale,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Short scale
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -319,10 +310,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -331,236 +321,217 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_ValueMemberDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_type_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_IDLType_ptr type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void type_def (
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA::Visibility access (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_access_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void access (
-      CORBA::Visibility access,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Visibility access
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_access_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ValueMemberDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_ValueMemberDef_Proxy_Impl &select_proxy (
-    ::CORBA_ValueMemberDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_ValueMemberDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -568,18 +539,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_ValueMemberDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -591,7 +562,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -599,60 +570,60 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_ValueMemberDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::TypeCode_ptr type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_IDLType_ptr type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_IDLType_ptr type_def
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA::Visibility access (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void access (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::Visibility access,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Visibility access
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -677,10 +648,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -689,283 +659,266 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_ValueDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA_InterfaceDefSeq * supported_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_supported_interfaces_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void supported_interfaces (
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & supported_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_supported_interfaces_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_InitializerSeq * initializers (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_initializers_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void initializers (
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_initializers_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ValueDef_ptr base_value (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_base_value_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void base_value (
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_ValueDef_ptr base_value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_base_value_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ValueDefSeq * abstract_base_values (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_abstract_base_values_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void abstract_base_values (
-      const CORBA_ValueDefSeq & abstract_base_values,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ValueDefSeq & abstract_base_values
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_abstract_base_values_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA::Boolean is_abstract (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_is_abstract_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void is_abstract (
-      CORBA::Boolean is_abstract,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean is_abstract
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_is_abstract_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA::Boolean is_custom (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_is_custom_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void is_custom (
-      CORBA::Boolean is_custom,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean is_custom
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_is_custom_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA::Boolean is_truncatable (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_is_truncatable_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void is_truncatable (
-      CORBA::Boolean is_truncatable,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean is_truncatable
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_is_truncatable_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA::Boolean is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void is_a_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ValueDef::FullValueDescription * describe_value (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void describe_value_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ValueMemberDef_ptr create_value_member (
@@ -973,19 +926,18 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      CORBA::Visibility access,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Visibility access
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_value_member_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_AttributeDef_ptr create_attribute (
@@ -993,19 +945,18 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_attribute_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_OperationDef_ptr create_operation (
@@ -1016,287 +967,255 @@ public:
       CORBA::OperationMode mode,
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ContextIdSeq & contexts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_operation_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void lookup_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void lookup_name_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_module_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_constant_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_struct_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_union_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_enum_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_alias_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_box_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_exception_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_native_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_abstract_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_local_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_ValueDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ValueDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_ValueDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_ValueDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_ValueDef_Proxy_Impl &select_proxy (
-    ::CORBA_ValueDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_ValueDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -1304,18 +1223,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_ValueDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -1327,7 +1246,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -1335,181 +1254,181 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_ValueDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl, 
-  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl, 
+  public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl,
+  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl,
   public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA_InterfaceDefSeq * supported_interfaces (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void supported_interfaces (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_InterfaceDefSeq & supported_interfaces
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_InitializerSeq * initializers (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void initializers (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ValueDef_ptr base_value (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void base_value (
       CORBA_Object *_collocated_tao_target_,
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_ValueDef_ptr base_value
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ValueDefSeq * abstract_base_values (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void abstract_base_values (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA_ValueDefSeq & abstract_base_values,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_ValueDefSeq & abstract_base_values
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA::Boolean is_abstract (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void is_abstract (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::Boolean is_abstract,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Boolean is_abstract
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA::Boolean is_custom (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void is_custom (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::Boolean is_custom,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Boolean is_custom
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA::Boolean is_truncatable (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void is_truncatable (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::Boolean is_truncatable,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Boolean is_truncatable
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA::Boolean is_a (
       CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV
+      const char * id
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ValueDef::FullValueDescription * describe_value (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ValueMemberDef_ptr create_value_member (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      CORBA::Visibility access,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Visibility access
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_AttributeDef_ptr create_attribute (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_OperationDef_ptr create_operation (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
@@ -1519,14 +1438,14 @@ public:
       CORBA::OperationMode mode,
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_ContextIdSeq & contexts
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -1551,10 +1470,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -1563,198 +1481,181 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_ValueBoxDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA_IDLType_ptr original_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_original_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void original_type_def (
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_original_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ValueBoxDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_ValueBoxDef_Proxy_Impl &select_proxy (
-    ::CORBA_ValueBoxDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_ValueBoxDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -1762,18 +1663,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_ValueBoxDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -1785,7 +1686,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -1793,35 +1694,35 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_ValueBoxDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA_IDLType_ptr original_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void original_type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.i b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.i
index 6c7be77d4d9..103672775f1 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.i
@@ -22,915 +22,915 @@
 ACE_INLINE void POA_CORBA_FixedDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_FixedDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_FixedDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_FixedDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_FixedDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_FixedDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h
index 15c28e07b90..9d4328f4b01 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h
@@ -52,7 +52,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_FixedDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -64,75 +64,67 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::UShort digits (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void digits (
-      CORBA::UShort digits,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::UShort digits
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::Short scale (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void scale (
-      CORBA::Short scale,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Short scale
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_FixedDef_tie (const POA_CORBA_FixedDef_tie &);
   void operator= (const POA_CORBA_FixedDef_tie &);
@@ -153,7 +145,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_ValueMemberDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -165,169 +157,150 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_IDLType_ptr type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void type_def (
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::Visibility access (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void access (
-      CORBA::Visibility access,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Visibility access
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_ValueMemberDef_tie (const POA_CORBA_ValueMemberDef_tie &);
   void operator= (const POA_CORBA_ValueMemberDef_tie &);
@@ -348,7 +321,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_ValueDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -360,174 +333,155 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA_InterfaceDefSeq * supported_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void supported_interfaces (
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & supported_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_InitializerSeq * initializers (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void initializers (
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueDef_ptr base_value (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void base_value (
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_ValueDef_ptr base_value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueDefSeq * abstract_base_values (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void abstract_base_values (
-      const CORBA_ValueDefSeq & abstract_base_values,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ValueDefSeq & abstract_base_values
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::Boolean is_abstract (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void is_abstract (
-      CORBA::Boolean is_abstract,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean is_abstract
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::Boolean is_custom (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void is_custom (
-      CORBA::Boolean is_custom,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean is_custom
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::Boolean is_truncatable (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void is_truncatable (
-      CORBA::Boolean is_truncatable,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean is_truncatable
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::Boolean is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueDef::FullValueDescription * describe_value (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueMemberDef_ptr create_value_member (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      CORBA::Visibility access,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Visibility access
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AttributeDef_ptr create_attribute (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_OperationDef_ptr create_operation (
       const char * id,
       const char * name,
@@ -536,141 +490,129 @@ public:
       CORBA::OperationMode mode,
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ContextIdSeq & contexts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * search_name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Long max_returned_objs
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueDef_ptr create_value (
       const char * id,
       const char * name,
@@ -681,196 +623,176 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_ValueDef_tie (const POA_CORBA_ValueDef_tie &);
   void operator= (const POA_CORBA_ValueDef_tie &);
@@ -891,7 +813,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_ValueBoxDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -903,152 +825,135 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA_IDLType_ptr original_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void original_type_def (
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_ValueBoxDef_tie (const POA_CORBA_ValueBoxDef_tie &);
   void operator= (const POA_CORBA_ValueBoxDef_tie &);
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i
index 9a6cd61cc9e..29831f87b03 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i
@@ -23,30 +23,30 @@
 
 template <class T> ACE_INLINE
 POA_CORBA_FixedDef_tie<T>::POA_CORBA_FixedDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_FixedDef_tie<T>::POA_CORBA_FixedDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_FixedDef_tie<T>::POA_CORBA_FixedDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_FixedDef_tie<T>::POA_CORBA_FixedDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -90,135 +90,135 @@ POA_CORBA_FixedDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_FixedDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_FixedDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_FixedDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_FixedDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::UShort POA_CORBA_FixedDef_tie<T>::digits  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->digits (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_FixedDef_tie<T>::digits  (
-    CORBA::UShort digits,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::UShort digits
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->digits (
-digits,
-    ACE_TRY_ENV
+digits
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Short POA_CORBA_FixedDef_tie<T>::scale  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->scale (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_FixedDef_tie<T>::scale  (
-    CORBA::Short scale,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Short scale
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->scale (
-scale,
-    ACE_TRY_ENV
+scale
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_FixedDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_FixedDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_FixedDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_ValueMemberDef_tie<T>::POA_CORBA_ValueMemberDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ValueMemberDef_tie<T>::POA_CORBA_ValueMemberDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ValueMemberDef_tie<T>::POA_CORBA_ValueMemberDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ValueMemberDef_tie<T>::POA_CORBA_ValueMemberDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -262,216 +262,216 @@ POA_CORBA_ValueMemberDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_ValueMemberDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_ValueMemberDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_ValueMemberDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_ValueMemberDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_ValueMemberDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_CORBA_ValueMemberDef_tie<T>::type_def  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type_def (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueMemberDef_tie<T>::type_def  (
-    CORBA_IDLType_ptr type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->type_def (
-type_def,
-    ACE_TRY_ENV
+type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Visibility POA_CORBA_ValueMemberDef_tie<T>::access  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->access (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueMemberDef_tie<T>::access  (
-    CORBA::Visibility access,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Visibility access
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->access (
-access,
-    ACE_TRY_ENV
+access
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueMemberDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueMemberDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueMemberDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueMemberDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueMemberDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueMemberDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_ValueMemberDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueMemberDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_ValueMemberDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_ValueMemberDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -479,8 +479,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_ValueMemberDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -489,63 +489,63 @@ void POA_CORBA_ValueMemberDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_ValueMemberDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueMemberDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_ValueDef_tie<T>::POA_CORBA_ValueDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ValueDef_tie<T>::POA_CORBA_ValueDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ValueDef_tie<T>::POA_CORBA_ValueDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ValueDef_tie<T>::POA_CORBA_ValueDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -589,235 +589,235 @@ POA_CORBA_ValueDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_ValueDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_ValueDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_ValueDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_ValueDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDefSeq * POA_CORBA_ValueDef_tie<T>::supported_interfaces  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->supported_interfaces (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::supported_interfaces  (
-    const CORBA_InterfaceDefSeq & supported_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & supported_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->supported_interfaces (
-supported_interfaces,
-    ACE_TRY_ENV
+supported_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_InitializerSeq * POA_CORBA_ValueDef_tie<T>::initializers  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->initializers (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::initializers  (
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->initializers (
-initializers,
-    ACE_TRY_ENV
+initializers
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ValueDef_ptr POA_CORBA_ValueDef_tie<T>::base_value  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->base_value (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::base_value  (
-    CORBA_ValueDef_ptr base_value,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_ValueDef_ptr base_value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->base_value (
-base_value,
-    ACE_TRY_ENV
+base_value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ValueDefSeq * POA_CORBA_ValueDef_tie<T>::abstract_base_values  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->abstract_base_values (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::abstract_base_values  (
-    const CORBA_ValueDefSeq & abstract_base_values,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ValueDefSeq & abstract_base_values
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->abstract_base_values (
-abstract_base_values,
-    ACE_TRY_ENV
+abstract_base_values
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_CORBA_ValueDef_tie<T>::is_abstract  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_abstract (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::is_abstract  (
-    CORBA::Boolean is_abstract,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean is_abstract
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->is_abstract (
-is_abstract,
-    ACE_TRY_ENV
+is_abstract
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_CORBA_ValueDef_tie<T>::is_custom  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_custom (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::is_custom  (
-    CORBA::Boolean is_custom,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean is_custom
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->is_custom (
-is_custom,
-    ACE_TRY_ENV
+is_custom
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_CORBA_ValueDef_tie<T>::is_truncatable  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_truncatable (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::is_truncatable  (
-    CORBA::Boolean is_truncatable,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean is_truncatable
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->is_truncatable (
-is_truncatable,
-    ACE_TRY_ENV
+is_truncatable
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_CORBA_ValueDef_tie<T>::is_a  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_a (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ValueDef::FullValueDescription * POA_CORBA_ValueDef_tie<T>::describe_value  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe_value (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -827,8 +827,8 @@ CORBA_ValueMemberDef_ptr POA_CORBA_ValueDef_tie<T>::create_value_member  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    CORBA::Visibility access,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Visibility access
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -839,8 +839,8 @@ id,
     name,
     version,
     type,
-    access,
-    ACE_TRY_ENV
+    access
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -850,8 +850,8 @@ CORBA_AttributeDef_ptr POA_CORBA_ValueDef_tie<T>::create_attribute  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::AttributeMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -862,8 +862,8 @@ id,
     name,
     version,
     type,
-    mode,
-    ACE_TRY_ENV
+    mode
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -876,8 +876,8 @@ CORBA_OperationDef_ptr POA_CORBA_ValueDef_tie<T>::create_operation  (
     CORBA::OperationMode mode,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -891,31 +891,31 @@ id,
     mode,
     params,
     exceptions,
-    contexts,
-    ACE_TRY_ENV
+    contexts
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_ValueDef_tie<T>::lookup  (
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup (
-search_name,
-    ACE_TRY_ENV
+search_name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_ValueDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -923,8 +923,8 @@ CORBA_ContainedSeq * POA_CORBA_ValueDef_tie<T>::contents  (
 {
   return this->ptr_->contents (
 limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -933,8 +933,8 @@ CORBA_ContainedSeq * POA_CORBA_ValueDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -944,8 +944,8 @@ CORBA_ContainedSeq * POA_CORBA_ValueDef_tie<T>::lookup_name  (
 search_name,
     levels_to_search,
     limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -953,8 +953,8 @@ template <class T> ACE_INLINE
 CORBA_Container::DescriptionSeq * POA_CORBA_ValueDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Long max_returned_objs
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -963,8 +963,8 @@ CORBA_Container::DescriptionSeq * POA_CORBA_ValueDef_tie<T>::describe_contents
   return this->ptr_->describe_contents (
 limit_type,
     exclude_inherited,
-    max_returned_objs,
-    ACE_TRY_ENV
+    max_returned_objs
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -972,8 +972,8 @@ template <class T> ACE_INLINE
 CORBA_ModuleDef_ptr POA_CORBA_ValueDef_tie<T>::create_module  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -982,8 +982,8 @@ CORBA_ModuleDef_ptr POA_CORBA_ValueDef_tie<T>::create_module  (
   return this->ptr_->create_module (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -993,8 +993,8 @@ CORBA_ConstantDef_ptr POA_CORBA_ValueDef_tie<T>::create_constant  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1005,8 +1005,8 @@ id,
     name,
     version,
     type,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1015,8 +1015,8 @@ CORBA_StructDef_ptr POA_CORBA_ValueDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1026,8 +1026,8 @@ CORBA_StructDef_ptr POA_CORBA_ValueDef_tie<T>::create_struct  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1037,8 +1037,8 @@ CORBA_UnionDef_ptr POA_CORBA_ValueDef_tie<T>::create_union  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1049,8 +1049,8 @@ id,
     name,
     version,
     discriminator_type,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1059,8 +1059,8 @@ CORBA_EnumDef_ptr POA_CORBA_ValueDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1070,8 +1070,8 @@ CORBA_EnumDef_ptr POA_CORBA_ValueDef_tie<T>::create_enum  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1080,8 +1080,8 @@ CORBA_AliasDef_ptr POA_CORBA_ValueDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1091,8 +1091,8 @@ CORBA_AliasDef_ptr POA_CORBA_ValueDef_tie<T>::create_alias  (
 id,
     name,
     version,
-    original_type,
-    ACE_TRY_ENV
+    original_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1101,8 +1101,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_ValueDef_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1112,8 +1112,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_ValueDef_tie<T>::create_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1128,8 +1128,8 @@ CORBA_ValueDef_ptr POA_CORBA_ValueDef_tie<T>::create_value  (
     CORBA::Boolean is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1145,8 +1145,8 @@ id,
     is_truncatable,
     abstract_base_values,
     supported_interfaces,
-    initializers,
-    ACE_TRY_ENV
+    initializers
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1155,8 +1155,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_ValueDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1166,8 +1166,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_ValueDef_tie<T>::create_value_box  (
 id,
     name,
     version,
-    original_type_def,
-    ACE_TRY_ENV
+    original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1176,8 +1176,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_ValueDef_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1187,8 +1187,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_ValueDef_tie<T>::create_exception  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1196,8 +1196,8 @@ template <class T> ACE_INLINE
 CORBA_NativeDef_ptr POA_CORBA_ValueDef_tie<T>::create_native  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1206,8 +1206,8 @@ CORBA_NativeDef_ptr POA_CORBA_ValueDef_tie<T>::create_native  (
   return this->ptr_->create_native (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1216,8 +1216,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_ValueDef_tie<T>::create_abstract_interf
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1227,8 +1227,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_ValueDef_tie<T>::create_abstract_interf
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1237,8 +1237,8 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_ValueDef_tie<T>::create_local_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1248,144 +1248,144 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_ValueDef_tie<T>::create_local_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_ValueDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_ValueDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_ValueDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1393,8 +1393,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1403,76 +1403,76 @@ void POA_CORBA_ValueDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_ValueDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_ValueDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_ValueBoxDef_tie<T>::POA_CORBA_ValueBoxDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ValueBoxDef_tie<T>::POA_CORBA_ValueBoxDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ValueBoxDef_tie<T>::POA_CORBA_ValueBoxDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ValueBoxDef_tie<T>::POA_CORBA_ValueBoxDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -1516,175 +1516,175 @@ POA_CORBA_ValueBoxDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_ValueBoxDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_ValueBoxDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_ValueBoxDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_ValueBoxDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_CORBA_ValueBoxDef_tie<T>::original_type_def  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->original_type_def (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueBoxDef_tie<T>::original_type_def  (
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->original_type_def (
-original_type_def,
-    ACE_TRY_ENV
+original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueBoxDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueBoxDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueBoxDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueBoxDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueBoxDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueBoxDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_ValueBoxDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueBoxDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_ValueBoxDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_ValueBoxDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1692,8 +1692,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_ValueBoxDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1702,47 +1702,47 @@ void POA_CORBA_ValueBoxDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_ValueBoxDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_ValueBoxDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueBoxDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
index 6764a787082..51fbfd395fa 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
@@ -12,10 +12,10 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG, "TAO Interface Repository\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      int status = server.init (argc, argv, ACE_TRY_ENV);
+      int status = server.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == -1)
@@ -24,10 +24,10 @@ main (int argc, char *argv[])
         }
       else
         {
-          server.run (ACE_TRY_ENV);
+          server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          status = server.fini (ACE_TRY_ENV);
+          status = server.fini (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (status == -1)
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
index ac25c0f5e77..045cad101bd 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
@@ -44,25 +44,25 @@ IFR_Service::~IFR_Service (void)
 
 int
 IFR_Service::init (int argc,
-                   char *argv[],
-                   CORBA::Environment &ACE_TRY_ENV)
+                   char *argv[]
+                   TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
-                                    0,
-                                    ACE_TRY_ENV);
+                                    0
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
-        this->orb_->resolve_initial_references ("RootPOA",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("RootPOA"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->root_poa_ =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int retval = OPTIONS::instance()->parse_args (argc,
@@ -71,31 +71,31 @@ IFR_Service::init (int argc,
       if (retval != 0)
         return retval;
 
-      retval = this->create_poas (ACE_TRY_ENV);
+      retval = this->create_poas (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval != 0)
         return retval;
 
-      retval = this->open_config (ACE_TRY_ENV);
+      retval = this->open_config (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval != 0)
         return retval;
 
-      retval = this->create_repository (ACE_TRY_ENV);
+      retval = this->create_repository (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval != 0)
         return retval;
 
-      retval = this->create_locator (ACE_TRY_ENV);
+      retval = this->create_locator (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval != 0)
         return retval;
 
-      retval = this->init_multicast_server (ACE_TRY_ENV);
+      retval = this->init_multicast_server (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval != 0)
@@ -118,22 +118,22 @@ IFR_Service::init (int argc,
 }
 
 int
-IFR_Service::run (CORBA::Environment &ACE_TRY_ENV)
+IFR_Service::run (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->orb_->run (0, ACE_TRY_ENV);
+  this->orb_->run (0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 int
-IFR_Service::fini (CORBA::Environment &ACE_TRY_ENV)
+IFR_Service::fini (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
       this->root_poa_->destroy (1,
-                                1,
-                                ACE_TRY_ENV);
+                                1
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -148,13 +148,13 @@ IFR_Service::fini (CORBA::Environment &ACE_TRY_ENV)
 }
 
 int
-IFR_Service::create_poas (CORBA::Environment &ACE_TRY_ENV)
+IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POAManager_var poa_manager =
-    this->root_poa_->the_POAManager (ACE_TRY_ENV);
+    this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  poa_manager->activate (ACE_TRY_ENV);
+  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::PolicyList policies (4);
@@ -162,8 +162,8 @@ IFR_Service::create_poas (CORBA::Environment &ACE_TRY_ENV)
 
   // So the Repository's POA can survive a crash.
   policies[0] =
-    this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT,
-                                             ACE_TRY_ENV);
+    this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_TString repo_name = "repoPOA";
@@ -171,8 +171,8 @@ IFR_Service::create_poas (CORBA::Environment &ACE_TRY_ENV)
   this->repo_poa_ =
     this->root_poa_->create_POA (repo_name.c_str (),
                                  poa_manager.in (),
-                                 policies,
-                                 ACE_TRY_ENV);
+                                 policies
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   policies.length (4);
@@ -180,24 +180,24 @@ IFR_Service::create_poas (CORBA::Environment &ACE_TRY_ENV)
   // So we can create object ids based on the DefinitionKind.
   policies[1] =
     this->root_poa_->create_id_assignment_policy (
-                         PortableServer::USER_ID,
-                         ACE_TRY_ENV
+                         PortableServer::USER_ID
+                         TAO_ENV_ARG_PARAMETER
                        );
   ACE_CHECK_RETURN (-1);
 
   // We'll use a servant manager.
   policies[2] =
     this->root_poa_->create_request_processing_policy (
-                         PortableServer::USE_SERVANT_MANAGER,
-                         ACE_TRY_ENV
+                         PortableServer::USE_SERVANT_MANAGER
+                         TAO_ENV_ARG_PARAMETER
                        );
   ACE_CHECK_RETURN (-1);
 
   // Specifically, we'll use a servant locator.
   policies[3] =
     this->root_poa_->create_servant_retention_policy (
-                         PortableServer::NON_RETAIN,
-                         ACE_TRY_ENV
+                         PortableServer::NON_RETAIN
+                         TAO_ENV_ARG_PARAMETER
                        );
   ACE_CHECK_RETURN (-1);
 
@@ -206,8 +206,8 @@ IFR_Service::create_poas (CORBA::Environment &ACE_TRY_ENV)
   this->ir_object_poa_ =
     this->root_poa_->create_POA (name.c_str (),
                                  poa_manager.in (),
-                                 policies,
-                                 ACE_TRY_ENV);
+                                 policies
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Destroy the policy objects as they have been passed to
@@ -217,7 +217,7 @@ IFR_Service::create_poas (CORBA::Environment &ACE_TRY_ENV)
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       CORBA::Policy_ptr policy = policies[i];
-      policy->destroy (ACE_TRY_ENV);
+      policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
@@ -225,22 +225,22 @@ IFR_Service::create_poas (CORBA::Environment &ACE_TRY_ENV)
 }
 
 int
-IFR_Service::create_locator (CORBA::Environment &ACE_TRY_ENV)
+IFR_Service::create_locator (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_NEW_THROW_EX (this->servant_locator_impl_,
                     IFR_ServantLocator (this->repo_impl_),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (-1);
 
-  this->ir_object_poa_->set_servant_manager (this->servant_locator_impl_,
-                                             ACE_TRY_ENV);
+  this->ir_object_poa_->set_servant_manager (this->servant_locator_impl_
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 int
-IFR_Service::open_config (CORBA::Environment &ACE_TRY_ENV)
+IFR_Service::open_config (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (OPTIONS::instance ()->using_registry ())
     {
@@ -294,7 +294,7 @@ IFR_Service::open_config (CORBA::Environment &ACE_TRY_ENV)
 }
 
 int
-IFR_Service::create_repository (CORBA::Environment &ACE_TRY_ENV)
+IFR_Service::create_repository (TAO_ENV_SINGLE_ARG_DECL)
 {
   TAO_ComponentRepository_i *impl = 0;
   ACE_NEW_THROW_EX (
@@ -328,11 +328,11 @@ IFR_Service::create_repository (CORBA::Environment &ACE_TRY_ENV)
   this->repo_impl_ = impl;
 
   PortableServer::ObjectId_var repo_oid =
-    this->repo_poa_->activate_object (impl_tie,
-                                      ACE_TRY_ENV);
+    this->repo_poa_->activate_object (impl_tie
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  this->repository_ = impl_tie->_this (ACE_TRY_ENV);
+  this->repository_ = impl_tie->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
 
@@ -340,17 +340,17 @@ IFR_Service::create_repository (CORBA::Environment &ACE_TRY_ENV)
 
   // Save and output the IOR string.
   this->ifr_ior_ =
-    this->orb_->object_to_string (this->repository_,
-                                  ACE_TRY_ENV);
+    this->orb_->object_to_string (this->repository_
+                                  TAO_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (-1);
 
   CORBA::Object_var table_object =
-    this->orb_->resolve_initial_references ("IORTable", ACE_TRY_ENV);
+    this->orb_->resolve_initial_references ("IORTable" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   IORTable::Table_var adapter =
-    IORTable::Table::_narrow (table_object.in (), ACE_TRY_ENV);
+    IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   if (CORBA::is_nil (adapter.in ()))
     {
@@ -359,8 +359,8 @@ IFR_Service::create_repository (CORBA::Environment &ACE_TRY_ENV)
   else
     {
       adapter->bind ("InterfaceRepository",
-                     this->ifr_ior_.in (),
-                     ACE_TRY_ENV);
+                     this->ifr_ior_.in ()
+                     TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
@@ -379,7 +379,7 @@ IFR_Service::create_repository (CORBA::Environment &ACE_TRY_ENV)
 
 // Install ior multicast handler.
 int
-IFR_Service::init_multicast_server (CORBA::Environment &ACE_TRY_ENV)
+IFR_Service::init_multicast_server (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Get reactor instance from TAO.
   ACE_Reactor *reactor = this->orb_->orb_core ()->reactor ();
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.h b/TAO/orbsvcs/IFR_Service/IFR_Service.h
index b2cae2223d4..c73abc1c595 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.h
@@ -45,30 +45,30 @@ public:
   // Destructor
 
   int init (int argc,
-            char *argv[],
-            CORBA::Environment &ACE_TRY_ENV);
+            char *argv[]
+            TAO_ENV_ARG_DECL);
   // Initialize the IFR service.
 
-  int run (CORBA::Environment &ACE_TRY_ENV);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the IFR service.
 
-  int fini (CORBA::Environment &ACE_TRY_ENV);
+  int fini (TAO_ENV_SINGLE_ARG_DECL);
   // Shut down the IFR service.
 
 protected:
-  int create_poas (CORBA::Environment &ACE_TRY_ENV);
+  int create_poas (TAO_ENV_SINGLE_ARG_DECL);
   // Two persistent POAs, one using a servant locator.
 
-  int create_locator (CORBA::Environment &ACE_TRY_ENV);
+  int create_locator (TAO_ENV_SINGLE_ARG_DECL);
   // Create a servant locator and register it with its POA.
 
-  int open_config (CORBA::Environment &ACE_TRY_ENV);
+  int open_config (TAO_ENV_SINGLE_ARG_DECL);
   // Open an ACE_Configuration of the appropriate type.
 
-  int create_repository (CORBA::Environment &ACE_TRY_ENV);
+  int create_repository (TAO_ENV_SINGLE_ARG_DECL);
   // Create and initialize the repository.
 
-  int init_multicast_server (CORBA::Environment &ACE_TRY_ENV);
+  int init_multicast_server (TAO_ENV_SINGLE_ARG_DECL);
   // Enable the Interface Repository to answer multicast requests
   // for its IOR.
 
diff --git a/TAO/orbsvcs/IFR_Service/IRObject_i.h b/TAO/orbsvcs/IFR_Service/IRObject_i.h
index eca29249604..315b1a508e6 100644
--- a/TAO/orbsvcs/IFR_Service/IRObject_i.h
+++ b/TAO/orbsvcs/IFR_Service/IRObject_i.h
@@ -53,23 +53,20 @@ public:
   // Destructor.
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Pure virtual.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Pure virtual.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Pure virtual- the unlocked version called by destroy() wrapper.
 
diff --git a/TAO/orbsvcs/IFR_Service/InterfaceDef_i.cpp b/TAO/orbsvcs/IFR_Service/InterfaceDef_i.cpp
index 0cb3193b5ad..2d66e4f1bf2 100644
--- a/TAO/orbsvcs/IFR_Service/InterfaceDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/InterfaceDef_i.cpp
@@ -25,53 +25,53 @@ TAO_InterfaceDef_i::~TAO_InterfaceDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_InterfaceDef_i::def_kind (CORBA::Environment &)
+TAO_InterfaceDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Interface;
 }
 
-void 
-TAO_InterfaceDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_InterfaceDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_InterfaceDef_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_InterfaceDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our members.
-  TAO_Container_i::destroy_i (ACE_TRY_ENV);
+  TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // This will get rid of the repo ids, which Contained_i::destroy()'s
   // call to remove_section (recursive = 1) will not get, and also
   // destroy the attribute's anonymous type, if any.
-  this->destroy_special ("attrs", ACE_TRY_ENV);
+  this->destroy_special ("attrs" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->destroy_special ("ops", ACE_TRY_ENV);
+  this->destroy_special ("ops" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Destroy ourself.
-  TAO_Contained_i::destroy_i (ACE_TRY_ENV);
+  TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA_Contained::Description *
-TAO_InterfaceDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_InterfaceDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_InterfaceDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_InterfaceDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_Contained::Description *desc_ptr = 0;
@@ -82,15 +82,15 @@ TAO_InterfaceDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
 
   CORBA_Contained::Description_var retval = desc_ptr;
 
-  retval->kind = this->def_kind (ACE_TRY_ENV);
+  retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA_InterfaceDescription ifd;
 
-  ifd.name = this->name_i (ACE_TRY_ENV);
+  ifd.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  ifd.id = this->id_i (ACE_TRY_ENV);
+  ifd.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_TString container_id;
@@ -101,11 +101,11 @@ TAO_InterfaceDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
 
   ifd.defined_in = container_id.c_str ();
 
-  ifd.version = this->version_i (ACE_TRY_ENV);
+  ifd.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong i = 0;
-  CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (ACE_TRY_ENV);
+  CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong length = bases->length ();
@@ -120,9 +120,9 @@ TAO_InterfaceDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
 
   for (i = 0; i < length; ++i)
     {
-      oid = 
-        this->repo_->ir_poa ()->reference_to_id (bases[i],
-                                                 ACE_TRY_ENV);
+      oid =
+        this->repo_->ir_poa ()->reference_to_id (bases[i]
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       base_path =
@@ -136,7 +136,7 @@ TAO_InterfaceDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
       TAO_InterfaceDef_i impl (this->repo_,
                                base_key);
 
-      repo_ids[i] = impl.id_i (ACE_TRY_ENV);
+      repo_ids[i] = impl.id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -147,17 +147,17 @@ TAO_InterfaceDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
   return retval._retn ();
 }
 
-CORBA::TypeCode_ptr 
-TAO_InterfaceDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_InterfaceDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_InterfaceDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_InterfaceDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -171,23 +171,23 @@ TAO_InterfaceDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
   this->repo_->config ()->get_string_value (this->section_key_,
                                             "name",
                                             name);
-  
+
   return this->repo_->tc_factory ()->create_interface_tc (id.c_str (),
-                                                          name.c_str (),
-                                                          ACE_TRY_ENV);
+                                                          name.c_str ()
+                                                          TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_InterfaceDefSeq *
-TAO_InterfaceDef_i::base_interfaces (CORBA::Environment &ACE_TRY_ENV)
+TAO_InterfaceDef_i::base_interfaces (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->base_interfaces_i (ACE_TRY_ENV);
+  return this->base_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_InterfaceDefSeq *
-TAO_InterfaceDef_i::base_interfaces_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_InterfaceDef_i::base_interfaces_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue;
@@ -215,41 +215,41 @@ TAO_InterfaceDef_i::base_interfaces_i (CORBA::Environment &ACE_TRY_ENV)
       ACE_TString path;
       path_queue.dequeue_head (path);
 
-      CORBA::Object_var obj = 
+      CORBA::Object_var obj =
         this->repo_->servant_factory ()->create_objref (
                                              def_kind,
-                                             path.c_str (),
-                                             ACE_TRY_ENV
+                                             path.c_str ()
+                                             TAO_ENV_ARG_PARAMETER
                                            );
       ACE_CHECK_RETURN (0);
 
-      retval[i] = CORBA_InterfaceDef::_narrow (obj.in (),
-                                               ACE_TRY_ENV);
+      retval[i] = CORBA_InterfaceDef::_narrow (obj.in ()
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
   return retval._retn ();
 }
 
-void 
-TAO_InterfaceDef_i::base_interfaces (const CORBA_InterfaceDefSeq &base_interfaces,
-                                     CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_InterfaceDef_i::base_interfaces (const CORBA_InterfaceDefSeq &base_interfaces
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->base_interfaces_i (base_interfaces,
-                           ACE_TRY_ENV);
+  this->base_interfaces_i (base_interfaces
+                           TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_InterfaceDef_i::base_interfaces_i (const CORBA_InterfaceDefSeq &base_interfaces,
-                                       CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_InterfaceDef_i::base_interfaces_i (const CORBA_InterfaceDefSeq &base_interfaces
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If we are an abstract interface, all our base interfaces must be
   // abstract as well.
-  CORBA::DefinitionKind def_kind = this->def_kind (ACE_TRY_ENV);
+  CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (def_kind == CORBA::dk_AbstractInterface)
@@ -258,7 +258,7 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA_InterfaceDefSeq &base_interfa
 
       for (CORBA::ULong i = 0; i < length; ++i)
         {
-          def_kind = base_interfaces[i]->def_kind (ACE_TRY_ENV);
+          def_kind = base_interfaces[i]->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           if (def_kind != CORBA::dk_AbstractInterface)
@@ -289,9 +289,9 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA_InterfaceDefSeq &base_interfa
 
   for (CORBA::ULong i = 0; i < length; i++)
     {
-      oid = 
-        this->repo_->ir_poa ()->reference_to_id (base_interfaces[i],
-                                                 ACE_TRY_ENV);
+      oid =
+        this->repo_->ir_poa ()->reference_to_id (base_interfaces[i]
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       inherited_path =
@@ -305,7 +305,7 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA_InterfaceDefSeq &base_interfa
       TAO_InterfaceDef_i impl (this->repo_,
                                base_key);
 
-      name = impl.name_i (ACE_TRY_ENV);
+      name = impl.name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // None of these names can clash with any we may already have.
@@ -320,20 +320,20 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA_InterfaceDefSeq &base_interfa
     }
 }
 
-CORBA::Boolean 
-TAO_InterfaceDef_i::is_a (const char *interface_id,
-                          CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_InterfaceDef_i::is_a (const char *interface_id
+                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->is_a_i (interface_id,
-                       ACE_TRY_ENV);
+  return this->is_a_i (interface_id
+                       TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA::Boolean 
-TAO_InterfaceDef_i::is_a_i (const char *interface_id,
-                            CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_InterfaceDef_i::is_a_i (const char *interface_id
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (interface_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
@@ -341,7 +341,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id,
       return 1;
     }
 
-  CORBA::String_var id = this->id_i (ACE_TRY_ENV);
+  CORBA::String_var id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Is it our type?
@@ -349,7 +349,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id,
     return 1;
 
   // Is it one of our ancestors' types?
-  CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (ACE_TRY_ENV);
+  CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong length = bases->length ();
@@ -360,9 +360,9 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id,
 
   for (CORBA::ULong i = 0; i < length; i++)
     {
-      oid = 
-        this->repo_->ir_poa ()->reference_to_id (bases[i],
-                                                 ACE_TRY_ENV);
+      oid =
+        this->repo_->ir_poa ()->reference_to_id (bases[i]
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       base_path =
@@ -376,8 +376,8 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id,
       TAO_InterfaceDef_i impl (this->repo_,
                                base_key);
 
-      CORBA::Boolean success = impl.is_a_i (interface_id,
-                                            ACE_TRY_ENV);
+      CORBA::Boolean success = impl.is_a_i (interface_id
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (success == 1)
@@ -388,16 +388,16 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id,
 }
 
 CORBA_InterfaceDef::FullInterfaceDescription *
-TAO_InterfaceDef_i::describe_interface (CORBA::Environment &ACE_TRY_ENV)
+TAO_InterfaceDef_i::describe_interface (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_interface_i (ACE_TRY_ENV);
-}     
+  return this->describe_interface_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+}
 
 CORBA_InterfaceDef::FullInterfaceDescription *
-TAO_InterfaceDef_i::describe_interface_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_InterfaceDef_i::describe_interface_i (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_InterfaceDef::FullInterfaceDescription *fifd = 0;
@@ -407,10 +407,10 @@ TAO_InterfaceDef_i::describe_interface_i (CORBA::Environment &ACE_TRY_ENV)
 
   CORBA_InterfaceDef::FullInterfaceDescription_var retval = fifd;
 
-  fifd->name = this->name_i (ACE_TRY_ENV);
+  fifd->name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  fifd->id = this->id_i (ACE_TRY_ENV);
+  fifd->id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_TString container_id;
@@ -421,7 +421,7 @@ TAO_InterfaceDef_i::describe_interface_i (CORBA::Environment &ACE_TRY_ENV)
 
   fifd->defined_in = container_id.c_str ();
 
-  fifd->version = this->version_i (ACE_TRY_ENV);
+  fifd->version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong i = 0;
@@ -472,7 +472,7 @@ TAO_InterfaceDef_i::describe_interface_i (CORBA::Environment &ACE_TRY_ENV)
       TAO_OperationDef_i op (this->repo_,
                              key);
 
-      fifd->operations[i] = op.make_description (ACE_TRY_ENV);
+      fifd->operations[i] = op.make_description (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -520,11 +520,11 @@ TAO_InterfaceDef_i::describe_interface_i (CORBA::Environment &ACE_TRY_ENV)
       TAO_AttributeDef_i attr (this->repo_,
                                key);
 
-      fifd->attributes[i] = attr.make_description (ACE_TRY_ENV);
+      fifd->attributes[i] = attr.make_description (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
-  CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (ACE_TRY_ENV);
+  CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong length = bases->length ();
@@ -539,9 +539,9 @@ TAO_InterfaceDef_i::describe_interface_i (CORBA::Environment &ACE_TRY_ENV)
 
   for (i = 0; i < length; ++i)
     {
-      oid = 
-        this->repo_->ir_poa ()->reference_to_id (bases[i],
-                                                 ACE_TRY_ENV);
+      oid =
+        this->repo_->ir_poa ()->reference_to_id (bases[i]
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       base_path =
@@ -555,26 +555,26 @@ TAO_InterfaceDef_i::describe_interface_i (CORBA::Environment &ACE_TRY_ENV)
       TAO_InterfaceDef_i impl (this->repo_,
                                base_key);
 
-      repo_ids[i] = impl.id_i (ACE_TRY_ENV);
+      repo_ids[i] = impl.id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
   fifd->base_interfaces = repo_ids;
 
-  fifd->type = this->type_i (ACE_TRY_ENV);
+  fifd->type = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return retval._retn ();
 }
 
-CORBA_AttributeDef_ptr 
+CORBA_AttributeDef_ptr
 TAO_InterfaceDef_i::create_attribute (
     const char *id,
     const char *name,
     const char *version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::AttributeMode mode
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -584,33 +584,33 @@ TAO_InterfaceDef_i::create_attribute (
                                    name,
                                    version,
                                    type,
-                                   mode,
-                                   ACE_TRY_ENV);
+                                   mode
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA_AttributeDef_ptr 
+CORBA_AttributeDef_ptr
 TAO_InterfaceDef_i::create_attribute_i (
     const char *id,
     const char *name,
     const char *version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::AttributeMode mode
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean bad_params = this->pre_exist (id, 
-                                               name, 
-                                               ACE_TRY_ENV);
+  CORBA::Boolean bad_params = this->pre_exist (id,
+                                               name
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ());
 
   if (bad_params)
     return CORBA_AttributeDef::_nil ();
 
-  bad_params = this->check_inherited_attrs (name,
-                                            ACE_TRY_ENV);
+  bad_params = this->check_inherited_attrs (name
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ());
-  
+
   if (bad_params)
     return CORBA_AttributeDef::_nil ();
 
@@ -626,17 +626,17 @@ TAO_InterfaceDef_i::create_attribute_i (
 
   // Common to all IR objects created in CORBA_Container.
   ACE_TString path = this->create_common (attrs_key,
-                                          new_key, 
-                                          id, 
-                                          name, 
+                                          new_key,
+                                          id,
+                                          name,
                                           version,
                                           "attrs\\",
                                           CORBA::dk_Attribute);
 
   // Store the path to the attribute's type definition.
-  PortableServer::ObjectId_var oid = 
-    this->repo_->ir_poa ()->reference_to_id (type,
-                                             ACE_TRY_ENV);
+  PortableServer::ObjectId_var oid =
+    this->repo_->ir_poa ()->reference_to_id (type
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ());
 
   CORBA::String_var type_path =
@@ -656,8 +656,8 @@ TAO_InterfaceDef_i::create_attribute_i (
                          name,
                          version,
                          type,
-                         mode,
-                         ACE_TRY_ENV);
+                         mode
+                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ());
 
 #if 0 // CCM specific.
@@ -679,9 +679,9 @@ TAO_InterfaceDef_i::create_attribute_i (
       // Store the paths to the 'get' exceptions.
       for (i = 0; i < length; ++i)
         {
-          PortableServer::ObjectId_var oid = 
-            this->repo_->ir_poa ()->reference_to_id (get_exceptions[i],
-                                                     ACE_TRY_ENV);
+          PortableServer::ObjectId_var oid =
+            this->repo_->ir_poa ()->reference_to_id (get_exceptions[i]
+                                                     TAO_ENV_ARG_PARAMETER);
 
           ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ());
 
@@ -711,9 +711,9 @@ TAO_InterfaceDef_i::create_attribute_i (
       // Store the paths to the 'put' exceptions.
       for (i = 0; i < length; ++i)
         {
-          PortableServer::ObjectId_var oid = 
-            this->repo_->ir_poa ()->reference_to_id (put_exceptions[i],
-                                                     ACE_TRY_ENV);
+          PortableServer::ObjectId_var oid =
+            this->repo_->ir_poa ()->reference_to_id (put_exceptions[i]
+                                                     TAO_ENV_ARG_PARAMETER);
 
           ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ());
 
@@ -733,19 +733,19 @@ TAO_InterfaceDef_i::create_attribute_i (
   // Create the object reference.
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Attribute,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ());
 
   CORBA_AttributeDef_var retval =
-    CORBA_AttributeDef::_narrow (obj.in (),
-                                 ACE_TRY_ENV);
+    CORBA_AttributeDef::_narrow (obj.in ()
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ());
 
   return retval._retn ();
 }
 
-CORBA_OperationDef_ptr 
+CORBA_OperationDef_ptr
 TAO_InterfaceDef_i::create_operation (const char *id,
                                       const char *name,
                                       const char *version,
@@ -753,8 +753,8 @@ TAO_InterfaceDef_i::create_operation (const char *id,
                                       CORBA::OperationMode mode,
                                       const CORBA_ParDescriptionSeq &params,
                                       const CORBA_ExceptionDefSeq &exceptions,
-                                      const CORBA_ContextIdSeq &contexts,
-                                      CORBA::Environment &ACE_TRY_ENV)
+                                      const CORBA_ContextIdSeq &contexts
+                                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_OperationDef::_nil ());
@@ -766,11 +766,11 @@ TAO_InterfaceDef_i::create_operation (const char *id,
                                    mode,
                                    params,
                                    exceptions,
-                                   contexts,
-                                   ACE_TRY_ENV); 
+                                   contexts
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA_OperationDef_ptr 
+CORBA_OperationDef_ptr
 TAO_InterfaceDef_i::create_operation_i (const char *id,
                                         const char *name,
                                         const char *version,
@@ -778,18 +778,18 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
                                         CORBA::OperationMode mode,
                                         const CORBA_ParDescriptionSeq &params,
                                         const CORBA_ExceptionDefSeq &exceptions,
-                                        const CORBA_ContextIdSeq &contexts,
-                                        CORBA::Environment &ACE_TRY_ENV)
+                                        const CORBA_ContextIdSeq &contexts
+                                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean bad_params = this->pre_exist (id, 
-                                               name, 
-                                               ACE_TRY_ENV);
+  CORBA::Boolean bad_params = this->pre_exist (id,
+                                               name
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_OperationDef::_nil ());
 
   if (bad_params)
     return CORBA_OperationDef::_nil ();
-  
+
   ACE_Configuration_Section_Key ops_key;
 
   // Create/open section for attributes.
@@ -802,20 +802,20 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
 
   // Common to all IR objects created in CORBA_Container.
   ACE_TString path = this->create_common (ops_key,
-                                          new_key, 
-                                          id, 
-                                          name, 
+                                          new_key,
+                                          id,
+                                          name,
                                           version,
                                           "ops\\",
                                           CORBA::dk_Operation);
 
   // Get the path to our return type and store it.
-  PortableServer::ObjectId_var oid = 
-    this->repo_->ir_poa ()->reference_to_id (result,
-                                             ACE_TRY_ENV);
+  PortableServer::ObjectId_var oid =
+    this->repo_->ir_poa ()->reference_to_id (result
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_OperationDef::_nil ());
 
-  CORBA::String_var result_path = 
+  CORBA::String_var result_path =
     PortableServer::ObjectId_to_string (oid.in ());
 
   this->repo_->config ()->set_string_value (new_key,
@@ -858,9 +858,9 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
           this->repo_->config ()->set_string_value (param_key,
                                                     "name",
                                                     params[i].name.in ());
-          PortableServer::ObjectId_var oid = 
-            this->repo_->ir_poa ()->reference_to_id (params[i].type_def.in (),
-                                                     ACE_TRY_ENV);
+          PortableServer::ObjectId_var oid =
+            this->repo_->ir_poa ()->reference_to_id (params[i].type_def.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
 
           ACE_CHECK_RETURN (CORBA_OperationDef::_nil ());
 
@@ -891,9 +891,9 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
 
       for (i = 0; i < length; ++i)
         {
-          PortableServer::ObjectId_var oid = 
-            this->repo_->ir_poa ()->reference_to_id (exceptions[i],
-                                                     ACE_TRY_ENV);
+          PortableServer::ObjectId_var oid =
+            this->repo_->ir_poa ()->reference_to_id (exceptions[i]
+                                                     TAO_ENV_ARG_PARAMETER);
 
           ACE_CHECK_RETURN (CORBA_OperationDef::_nil ());
 
@@ -933,25 +933,25 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
   // Create the object reference.
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Operation,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_OperationDef::_nil ());
 
   CORBA_OperationDef_var retval =
-    CORBA_OperationDef::_narrow (obj.in (),
-                                 ACE_TRY_ENV);
+    CORBA_OperationDef::_narrow (obj.in ()
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_OperationDef::_nil ());
 
   return retval._retn ();
 }
 
-void 
+void
 TAO_InterfaceDef_i::interface_contents (
     ACE_Unbounded_Queue<CORBA::DefinitionKind> &kind_queue,
     ACE_Unbounded_Queue<ACE_TString> &path_queue,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1051,16 +1051,16 @@ TAO_InterfaceDef_i::interface_contents (
           base_iface.interface_contents (kind_queue,
                                          path_queue,
                                          limit_type,
-                                         exclude_inherited,
-                                         ACE_TRY_ENV);
-          ACE_CHECK;          
+                                         exclude_inherited
+                                         TAO_ENV_ARG_PARAMETER);
+          ACE_CHECK;
         }
     }
 }
 
 void
-TAO_InterfaceDef_i::destroy_special (const char *sub_section,
-                                     CORBA::Environment &ACE_TRY_ENV)
+TAO_InterfaceDef_i::destroy_special (const char *sub_section
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration_Section_Key sub_key;
@@ -1087,19 +1087,19 @@ TAO_InterfaceDef_i::destroy_special (const char *sub_section,
           TAO_AttributeDef_i attr (this->repo_,
                                    member_key);
 
-          attr.destroy_i (ACE_TRY_ENV);
+          attr.destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
       else
-        { 
+        {
           TAO_OperationDef_i op (this->repo_,
                                  member_key);
 
-          op.destroy_i (ACE_TRY_ENV);
+          op.destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
-                                                    
+
 }
 
 void
@@ -1107,8 +1107,8 @@ TAO_InterfaceDef_i::create_attr_ops (const char *id,
                                      const char *name,
                                      const char *version,
                                      CORBA_IDLType_ptr type,
-                                     CORBA::AttributeMode mode,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     CORBA::AttributeMode mode
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_CString the_get_name ("_get_");
@@ -1135,8 +1135,8 @@ TAO_InterfaceDef_i::create_attr_ops (const char *id,
                               CORBA::OP_NORMAL,
                               params,
                               excepts,
-                              contexts,
-                              ACE_TRY_ENV);
+                              contexts
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (mode == CORBA::ATTR_NORMAL)
@@ -1147,9 +1147,9 @@ TAO_InterfaceDef_i::create_attr_ops (const char *id,
 
       the_set_name += name;
 
-      CORBA_PrimitiveDef_var rettype = 
-        this->repo_->get_primitive (CORBA::pk_void,
-                                    ACE_TRY_ENV);
+      CORBA_PrimitiveDef_var rettype =
+        this->repo_->get_primitive (CORBA::pk_void
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       params.length (1);
@@ -1167,13 +1167,13 @@ TAO_InterfaceDef_i::create_attr_ops (const char *id,
                                   CORBA::OP_NORMAL,
                                   params,
                                   excepts,
-                                  contexts,
-                                  ACE_TRY_ENV);
+                                  contexts
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
-void 
+void
 TAO_InterfaceDef_i::base_interfaces_recursive (
     ACE_Unbounded_Queue<CORBA::DefinitionKind> &kind_queue,
     ACE_Unbounded_Queue<ACE_TString> &path_queue
@@ -1230,7 +1230,7 @@ TAO_InterfaceDef_i::base_interfaces_recursive (
     }
 }
 
-void 
+void
 TAO_InterfaceDef_i::inherited_attributes (
     ACE_Unbounded_Queue<ACE_Configuration_Section_Key> &key_queue
   )
@@ -1251,7 +1251,7 @@ TAO_InterfaceDef_i::inherited_attributes (
     {
       path_queue.dequeue_head (path_name);
 
-      status = 
+      status =
         this->repo_->config ()->expand_path (this->repo_->root_key (),
                                              path_name,
                                              base_key,
@@ -1281,7 +1281,7 @@ TAO_InterfaceDef_i::inherited_attributes (
     }
 }
 
-void 
+void
 TAO_InterfaceDef_i::inherited_operations (
     ACE_Unbounded_Queue<ACE_Configuration_Section_Key> &key_queue
   )
@@ -1302,7 +1302,7 @@ TAO_InterfaceDef_i::inherited_operations (
     {
       path_queue.dequeue_head (path_name);
 
-      status = 
+      status =
         this->repo_->config ()->expand_path (this->repo_->root_key (),
                                              path_name,
                                              base_key,
@@ -1332,9 +1332,9 @@ TAO_InterfaceDef_i::inherited_operations (
     }
 }
 
-CORBA::Boolean 
-TAO_InterfaceDef_i::check_inherited_attrs (const char *name,
-                                           CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_InterfaceDef_i::check_inherited_attrs (const char *name
+                                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<ACE_Configuration_Section_Key> key_queue;
diff --git a/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h b/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h
index 6cce4cefab1..88a237df5ad 100644
--- a/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h
@@ -35,8 +35,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_InterfaceDef_i : public virtual TAO_Container_i, 
-                           public virtual TAO_Contained_i, 
+class TAO_InterfaceDef_i : public virtual TAO_Container_i,
+                           public virtual TAO_Contained_i,
                            public virtual TAO_IDLType_i
 {
   // = TITLE
@@ -51,117 +51,101 @@ public:
   // Constructor
 
   virtual ~TAO_InterfaceDef_i (void);
-  // Destructor  
+  // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA_InterfaceDefSeq *base_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_InterfaceDefSeq *base_interfaces_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void base_interfaces (
-      const CORBA_InterfaceDefSeq &base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq &base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void base_interfaces_i (
-      const CORBA_InterfaceDefSeq &base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq &base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_a (
-      const char *interface_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *interface_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
-      const char *interface_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *interface_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_InterfaceDef::FullInterfaceDescription *describe_interface (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));      
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_InterfaceDef::FullInterfaceDescription *describe_interface_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));      
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_AttributeDef_ptr create_attribute (
       const char *id,
       const char *name,
       const char *version,
       CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_AttributeDef_ptr create_attribute_i (
@@ -169,10 +153,9 @@ public:
       const char *name,
       const char *version,
       CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_OperationDef_ptr create_operation (
@@ -183,10 +166,9 @@ public:
       CORBA::OperationMode mode,
       const CORBA_ParDescriptionSeq &params,
       const CORBA_ExceptionDefSeq &exceptions,
-      const CORBA_ContextIdSeq &contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ContextIdSeq &contexts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_OperationDef_ptr create_operation_i (
@@ -197,29 +179,26 @@ public:
       CORBA::OperationMode mode,
       const CORBA_ParDescriptionSeq &params,
       const CORBA_ExceptionDefSeq &exceptions,
-      const CORBA_ContextIdSeq &contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ContextIdSeq &contexts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void interface_contents (
       ACE_Unbounded_Queue<CORBA::DefinitionKind> &kind_queue,
       ACE_Unbounded_Queue<ACE_TString> &path_queue,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Gathers the attributes and operations of all the ancestors.
 
 private:
   void destroy_special (
-      const char *sub_section,
-        CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *sub_section
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Removed the repo ids of our attributes and operations from
   // the flat repo ids section of the repository.
@@ -228,8 +207,8 @@ private:
                         const char *name,
                         const char *version,
                         CORBA_IDLType_ptr type,
-                        CORBA::AttributeMode mode,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::AttributeMode mode
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Create set and/or get operations for an attribute.
 
@@ -252,8 +231,8 @@ private:
   // Depth-first traversal of the inheritance tree to get all the
   // operations.
 
-  CORBA::Boolean check_inherited_attrs (const char *name,
-                                        CORBA::Environment &ACE_TRY_ENV)
+  CORBA::Boolean check_inherited_attrs (const char *name
+                                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // When creating a new attribute, check for a clash with an inherited
   // attribute name.
diff --git a/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.cpp b/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.cpp
index d51a8959ad4..06c9d510374 100644
--- a/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.cpp
@@ -23,26 +23,26 @@ TAO_LocalInterfaceDef_i::~TAO_LocalInterfaceDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_LocalInterfaceDef_i::def_kind (CORBA::Environment &)
+TAO_LocalInterfaceDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_LocalInterface;
 }
 
-CORBA::Boolean 
-TAO_LocalInterfaceDef_i::is_a (const char *interface_id,
-                               CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_LocalInterfaceDef_i::is_a (const char *interface_id
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->is_a_i (interface_id,
-                       ACE_TRY_ENV);
+  return this->is_a_i (interface_id
+                       TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA::Boolean 
-TAO_LocalInterfaceDef_i::is_a_i (const char *interface_id,
-                                 CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_LocalInterfaceDef_i::is_a_i (const char *interface_id
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (interface_id, "IDL:omg.org/CORBA/LocalBase:1.0") == 0)
@@ -50,6 +50,6 @@ TAO_LocalInterfaceDef_i::is_a_i (const char *interface_id,
       return 1;
     }
 
-  return this->TAO_InterfaceDef_i::is_a_i (interface_id,
-                                           ACE_TRY_ENV);
+  return this->TAO_InterfaceDef_i::is_a_i (interface_id
+                                           TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.h b/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.h
index a6a178629eb..9c99c164af3 100644
--- a/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.h
@@ -47,27 +47,24 @@ public:
   // Constructor
 
   virtual ~TAO_LocalInterfaceDef_i (void);
-  // Destructor  
+  // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA::Boolean is_a (
-      const char *interface_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *interface_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
-      const char *interface_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *interface_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp b/TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp
index 9e2963720c9..81063de075e 100644
--- a/TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp
@@ -19,45 +19,45 @@ TAO_ModuleDef_i::~TAO_ModuleDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ModuleDef_i::def_kind (CORBA::Environment &)
+TAO_ModuleDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Module;
 }
 
 void 
-TAO_ModuleDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_ModuleDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void 
-TAO_ModuleDef_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_ModuleDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our members.
-  TAO_Container_i::destroy_i (ACE_TRY_ENV);
+  TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
     
   // Destroy ourself.
-  TAO_Contained_i::destroy_i (ACE_TRY_ENV);
+  TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA_Contained::Description *
-TAO_ModuleDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_ModuleDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_ModuleDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_ModuleDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_Contained::Description *desc_ptr = 0;
@@ -68,15 +68,15 @@ TAO_ModuleDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
 
   CORBA_Contained::Description_var retval = desc_ptr;
 
-  retval->kind = this->def_kind (ACE_TRY_ENV);
+  retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA_ModuleDescription md;
 
-  md.name = this->name_i (ACE_TRY_ENV);
+  md.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  md.id = this->id_i (ACE_TRY_ENV);
+  md.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_TString container_id;
@@ -87,7 +87,7 @@ TAO_ModuleDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
 
   md.defined_in = container_id.c_str ();
 
-  md.version = this->version_i (ACE_TRY_ENV);
+  md.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   retval->value <<= md;
diff --git a/TAO/orbsvcs/IFR_Service/ModuleDef_i.h b/TAO/orbsvcs/IFR_Service/ModuleDef_i.h
index ef5e8d224fd..d6f1c902c12 100644
--- a/TAO/orbsvcs/IFR_Service/ModuleDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/ModuleDef_i.h
@@ -52,37 +52,32 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 };
diff --git a/TAO/orbsvcs/IFR_Service/NativeDef_i.cpp b/TAO/orbsvcs/IFR_Service/NativeDef_i.cpp
index 6aa481df36e..458f8b216c1 100644
--- a/TAO/orbsvcs/IFR_Service/NativeDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/NativeDef_i.cpp
@@ -20,23 +20,23 @@ TAO_NativeDef_i::~TAO_NativeDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_NativeDef_i::def_kind (CORBA::Environment &)
+TAO_NativeDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Native;
 }
 
-CORBA::TypeCode_ptr 
-TAO_NativeDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_NativeDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_NativeDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_NativeDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -50,7 +50,7 @@ TAO_NativeDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
                                             name);
 
   return this->repo_->tc_factory ()->create_native_tc (id.c_str (),
-                                                       name.c_str (),
-                                                       ACE_TRY_ENV);
+                                                       name.c_str ()
+                                                       TAO_ENV_ARG_PARAMETER);
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/NativeDef_i.h b/TAO/orbsvcs/IFR_Service/NativeDef_i.h
index d369fbba640..b3e758f97ac 100644
--- a/TAO/orbsvcs/IFR_Service/NativeDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/NativeDef_i.h
@@ -51,23 +51,20 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 };
diff --git a/TAO/orbsvcs/IFR_Service/OperationDef_i.cpp b/TAO/orbsvcs/IFR_Service/OperationDef_i.cpp
index 80c674f66f5..93a972df3bb 100644
--- a/TAO/orbsvcs/IFR_Service/OperationDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/OperationDef_i.cpp
@@ -24,23 +24,23 @@ TAO_OperationDef_i::~TAO_OperationDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_OperationDef_i::def_kind (CORBA::Environment &)
+TAO_OperationDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Operation;
 }
 
 CORBA_Contained::Description *
-TAO_OperationDef_i::describe (CORBA::Environment &ACE_TRY_ENV )
+TAO_OperationDef_i::describe (TAO_ENV_SINGLE_ARG_DECL )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_OperationDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV )
+TAO_OperationDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_Contained::Description *desc_ptr = 0;
@@ -51,26 +51,26 @@ TAO_OperationDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV )
 
   CORBA_Contained::Description_var retval = desc_ptr;
 
-  retval->kind = this->def_kind (ACE_TRY_ENV);
+  retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  retval->value <<= this->make_description (ACE_TRY_ENV);
+  retval->value <<= this->make_description (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return retval._retn ();
 }
 
-CORBA::TypeCode_ptr 
-TAO_OperationDef_i::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_OperationDef_i::result (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->result_i (ACE_TRY_ENV);
+  return this->result_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_OperationDef_i::result_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_OperationDef_i::result_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString result_path;
@@ -85,26 +85,26 @@ TAO_OperationDef_i::result_i (CORBA::Environment &ACE_TRY_ENV)
                                        0);
 
   TAO_IDLType_i *impl =
-    this->repo_->servant_factory ()->create_idltype (result_key,
-                                                     ACE_TRY_ENV);
+    this->repo_->servant_factory ()->create_idltype (result_key
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   auto_ptr<TAO_IDLType_i> safety (impl);
 
-  return impl->type_i (ACE_TRY_ENV);
+  return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_IDLType_ptr 
-TAO_OperationDef_i::result_def (CORBA::Environment &ACE_TRY_ENV)
+CORBA_IDLType_ptr
+TAO_OperationDef_i::result_def (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ());
 
-  return this->result_def_i (ACE_TRY_ENV);
+  return this->result_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_IDLType_ptr 
-TAO_OperationDef_i::result_def_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA_IDLType_ptr
+TAO_OperationDef_i::result_def_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString result_path;
@@ -128,33 +128,33 @@ TAO_OperationDef_i::result_def_i (CORBA::Environment &ACE_TRY_ENV)
 
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (def_kind,
-                                                    result_path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    result_path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
 
-  return CORBA_IDLType::_narrow (obj.in (),
-                                 ACE_TRY_ENV);
+  return CORBA_IDLType::_narrow (obj.in ()
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_OperationDef_i::result_def (CORBA_IDLType_ptr result_def,
-                                CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_OperationDef_i::result_def (CORBA_IDLType_ptr result_def
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->result_def_i (result_def,
-                      ACE_TRY_ENV);
+  this->result_def_i (result_def
+                      TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_OperationDef_i::result_def_i (CORBA_IDLType_ptr result_def,
-                                  CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_OperationDef_i::result_def_i (CORBA_IDLType_ptr result_def
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::ObjectId_var oid = 
-    this->repo_->ir_poa ()->reference_to_id (result_def,
-                                             ACE_TRY_ENV);
+  PortableServer::ObjectId_var oid =
+    this->repo_->ir_poa ()->reference_to_id (result_def
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var result_path =
@@ -166,16 +166,16 @@ TAO_OperationDef_i::result_def_i (CORBA_IDLType_ptr result_def,
 }
 
 CORBA_ParDescriptionSeq *
-TAO_OperationDef_i::params (CORBA::Environment &ACE_TRY_ENV)
+TAO_OperationDef_i::params (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->params_i (ACE_TRY_ENV);
+  return this->params_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_ParDescriptionSeq *
-TAO_OperationDef_i::params_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_OperationDef_i::params_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong i = 0;
@@ -257,13 +257,13 @@ TAO_OperationDef_i::params_i (CORBA::Environment &ACE_TRY_ENV)
                                            0);
 
       TAO_IDLType_i *impl =
-        this->repo_->servant_factory ()->create_idltype (type_key,
-                                                         ACE_TRY_ENV);
+        this->repo_->servant_factory ()->create_idltype (type_key
+                                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       auto_ptr<TAO_IDLType_i> safety (impl);
 
-      retval[i].type = impl->type_i (ACE_TRY_ENV);
+      retval[i].type = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       u_int kind = 0;
@@ -274,34 +274,34 @@ TAO_OperationDef_i::params_i (CORBA::Environment &ACE_TRY_ENV)
       CORBA::DefinitionKind def_kind =
         ACE_static_cast (CORBA::DefinitionKind, kind);
 
-      CORBA::Object_var obj = 
+      CORBA::Object_var obj =
         this->repo_->servant_factory ()->create_objref (def_kind,
-                                                        type_path.c_str (),
-                                                        ACE_TRY_ENV);
+                                                        type_path.c_str ()
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      retval[i].type_def = CORBA_IDLType::_narrow (obj.in (),
-                                                   ACE_TRY_ENV);
+      retval[i].type_def = CORBA_IDLType::_narrow (obj.in ()
+                                                   TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
   return retval._retn ();
 }
 
-void 
-TAO_OperationDef_i::params (const CORBA_ParDescriptionSeq &params,
-                            CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_OperationDef_i::params (const CORBA_ParDescriptionSeq &params
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->params_i (params,
-                  ACE_TRY_ENV);
+  this->params_i (params
+                  TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_OperationDef_i::params_i (const CORBA_ParDescriptionSeq &params,
-                              CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_OperationDef_i::params_i (const CORBA_ParDescriptionSeq &params
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
@@ -336,9 +336,9 @@ TAO_OperationDef_i::params_i (const CORBA_ParDescriptionSeq &params,
       this->repo_->config ()->set_string_value (param_key,
                                                 "name",
                                                 params[i].name.in ());
-      PortableServer::ObjectId_var oid = 
-        this->repo_->ir_poa ()->reference_to_id (params[i].type_def.in (),
-                                                 ACE_TRY_ENV);
+      PortableServer::ObjectId_var oid =
+        this->repo_->ir_poa ()->reference_to_id (params[i].type_def.in ()
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::String_var type_path =
@@ -354,17 +354,17 @@ TAO_OperationDef_i::params_i (const CORBA_ParDescriptionSeq &params,
     }
 }
 
-CORBA::OperationMode 
-TAO_OperationDef_i::mode (CORBA::Environment &ACE_TRY_ENV)
+CORBA::OperationMode
+TAO_OperationDef_i::mode (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::OP_NORMAL);
 
-  return this->mode_i (ACE_TRY_ENV);
+  return this->mode_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::OperationMode 
-TAO_OperationDef_i::mode_i (CORBA::Environment &)
+CORBA::OperationMode
+TAO_OperationDef_i::mode_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int mode;
@@ -375,20 +375,20 @@ TAO_OperationDef_i::mode_i (CORBA::Environment &)
   return ACE_static_cast (CORBA::OperationMode, mode);
 }
 
-void 
-TAO_OperationDef_i::mode (CORBA::OperationMode mode,
-                          CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_OperationDef_i::mode (CORBA::OperationMode mode
+                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->mode_i (mode,
-                ACE_TRY_ENV);
+  this->mode_i (mode
+                TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_OperationDef_i::mode_i (CORBA::OperationMode mode,
-                            CORBA::Environment &)
+void
+TAO_OperationDef_i::mode_i (CORBA::OperationMode mode
+                            TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
@@ -397,16 +397,16 @@ TAO_OperationDef_i::mode_i (CORBA::OperationMode mode,
 }
 
 CORBA_ContextIdSeq *
-TAO_OperationDef_i::contexts (CORBA::Environment &ACE_TRY_ENV)
+TAO_OperationDef_i::contexts (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->contexts_i (ACE_TRY_ENV);
+  return this->contexts_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_ContextIdSeq *
-TAO_OperationDef_i::contexts_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_OperationDef_i::contexts_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration_Section_Key contexts_key;
@@ -425,7 +425,7 @@ TAO_OperationDef_i::contexts_i (CORBA::Environment &ACE_TRY_ENV)
       CORBA::String_var field_name = this->int_to_string (index);
       ACE_TString context;
 
-      // Don't have to worry about gaps here - contexts are not 
+      // Don't have to worry about gaps here - contexts are not
       // IR objects so they can't be destroyed one at a time. To
       // make a change one has to call the mutator version of this
       // function and make a completely new list.
@@ -460,20 +460,20 @@ TAO_OperationDef_i::contexts_i (CORBA::Environment &ACE_TRY_ENV)
   return ci_seq;
 }
 
-void 
-TAO_OperationDef_i::contexts (const CORBA_ContextIdSeq &contexts,
-                              CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_OperationDef_i::contexts (const CORBA_ContextIdSeq &contexts
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->contexts_i (contexts,
-                    ACE_TRY_ENV);
+  this->contexts_i (contexts
+                    TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_OperationDef_i::contexts_i (const CORBA_ContextIdSeq &contexts,
-                                CORBA::Environment &)
+void
+TAO_OperationDef_i::contexts_i (const CORBA_ContextIdSeq &contexts
+                                TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
@@ -502,16 +502,16 @@ TAO_OperationDef_i::contexts_i (const CORBA_ContextIdSeq &contexts,
 }
 
 CORBA_ExceptionDefSeq *
-TAO_OperationDef_i::exceptions (CORBA::Environment &ACE_TRY_ENV )
+TAO_OperationDef_i::exceptions (TAO_ENV_SINGLE_ARG_DECL )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->exceptions_i (ACE_TRY_ENV);
+  return this->exceptions_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_ExceptionDefSeq *
-TAO_OperationDef_i::exceptions_i (CORBA::Environment &ACE_TRY_ENV )
+TAO_OperationDef_i::exceptions_i (TAO_ENV_SINGLE_ARG_DECL )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration_Section_Key excepts_key;
@@ -558,7 +558,7 @@ TAO_OperationDef_i::exceptions_i (CORBA::Environment &ACE_TRY_ENV )
                                                          "def_kind",
                                                          kind);
 
-              def_kind = 
+              def_kind =
                 ACE_static_cast (CORBA::DefinitionKind, kind);
 
               kind_queue.enqueue_tail (def_kind);
@@ -591,32 +591,32 @@ TAO_OperationDef_i::exceptions_i (CORBA::Environment &ACE_TRY_ENV )
 
       CORBA::Object_var obj =
         this->repo_->servant_factory ()->create_objref (def_kind,
-                                                        path.c_str (),
-                                                        ACE_TRY_ENV);
+                                                        path.c_str ()
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      retval[i] = CORBA_ExceptionDef::_narrow (obj.in (),
-                                               ACE_TRY_ENV);
+      retval[i] = CORBA_ExceptionDef::_narrow (obj.in ()
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
   return retval._retn ();
 }
 
-void 
-TAO_OperationDef_i::exceptions (const CORBA_ExceptionDefSeq &exceptions,
-                                CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_OperationDef_i::exceptions (const CORBA_ExceptionDefSeq &exceptions
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->exceptions_i (exceptions,
-                      ACE_TRY_ENV);
+  this->exceptions_i (exceptions
+                      TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_OperationDef_i::exceptions_i (const CORBA_ExceptionDefSeq &exceptions,
-                                  CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_OperationDef_i::exceptions_i (const CORBA_ExceptionDefSeq &exceptions
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
@@ -636,9 +636,9 @@ TAO_OperationDef_i::exceptions_i (const CORBA_ExceptionDefSeq &exceptions,
 
   for (CORBA::ULong i = 0; i < length; i++)
     {
-      PortableServer::ObjectId_var oid = 
-        this->repo_->ir_poa ()->reference_to_id (exceptions[i],
-                                                 ACE_TRY_ENV);
+      PortableServer::ObjectId_var oid =
+        this->repo_->ir_poa ()->reference_to_id (exceptions[i]
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::String_var type_path =
@@ -655,15 +655,15 @@ TAO_OperationDef_i::exceptions_i (const CORBA_ExceptionDefSeq &exceptions,
 
 CORBA_OperationDescription
 TAO_OperationDef_i::make_description (
-      CORBA::Environment &ACE_TRY_ENV)
+      TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_OperationDescription od;
 
-  od.name = this->name_i (ACE_TRY_ENV);
+  od.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (od);
 
-  od.id = this->id_i (ACE_TRY_ENV);
+  od.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (od);
 
   ACE_TString container_id;
@@ -673,21 +673,21 @@ TAO_OperationDef_i::make_description (
 
   od.defined_in = container_id.c_str ();
 
-  od.version = this->version_i (ACE_TRY_ENV);
+  od.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (od);
 
-  od.result = this->result_i (ACE_TRY_ENV);
+  od.result = this->result_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (od);
 
-  od.mode = this->mode_i (ACE_TRY_ENV);
+  od.mode = this->mode_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (od);
 
-  CORBA_ContextIdSeq_var cid_seq = this->contexts_i (ACE_TRY_ENV);
+  CORBA_ContextIdSeq_var cid_seq = this->contexts_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (od);
 
   od.contexts = cid_seq.in ();
 
-  CORBA_ParDescriptionSeq_var pd_seq = this->params_i (ACE_TRY_ENV);
+  CORBA_ParDescriptionSeq_var pd_seq = this->params_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (od);
 
   od.parameters = pd_seq.in ();
@@ -771,7 +771,7 @@ TAO_OperationDef_i::make_description (
           TAO_ExceptionDef_i impl (this->repo_,
                                    type_key);
 
-          od.exceptions[i].type = impl.type_i (ACE_TRY_ENV);
+          od.exceptions[i].type = impl.type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (od);
         }
     }
diff --git a/TAO/orbsvcs/IFR_Service/OperationDef_i.h b/TAO/orbsvcs/IFR_Service/OperationDef_i.h
index 4dacb031d71..165d3a23d39 100644
--- a/TAO/orbsvcs/IFR_Service/OperationDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/OperationDef_i.h
@@ -51,172 +51,146 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr result (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr result_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_IDLType_ptr result_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_IDLType_ptr result_def_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void result_def (
-      CORBA_IDLType_ptr result_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr result_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result_def_i (
-      CORBA_IDLType_ptr result_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr result_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ParDescriptionSeq *params (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ParDescriptionSeq *params_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void params (
-      const CORBA_ParDescriptionSeq &params,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ParDescriptionSeq &params
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void params_i (
-      const CORBA_ParDescriptionSeq &params,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ParDescriptionSeq &params
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::OperationMode mode (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::OperationMode mode_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void mode (
-      CORBA::OperationMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::OperationMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void mode_i (
-      CORBA::OperationMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::OperationMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ContextIdSeq *contexts (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ContextIdSeq *contexts_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void contexts (
-      const CORBA_ContextIdSeq &contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ContextIdSeq &contexts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void contexts_i (
-      const CORBA_ContextIdSeq &contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ContextIdSeq &contexts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ExceptionDefSeq *exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ExceptionDefSeq *exceptions_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void exceptions (
-      const CORBA_ExceptionDefSeq &exceptions,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ExceptionDefSeq &exceptions
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void exceptions_i (
-      const CORBA_ExceptionDefSeq &exceptions,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ExceptionDefSeq &exceptions
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_OperationDescription make_description (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Common code for InterfaceDef to call in
   // making its own description.
diff --git a/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.cpp b/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.cpp
index d93a60be76c..f293fdee802 100644
--- a/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.cpp
@@ -20,76 +20,76 @@ TAO_PrimaryKeyDef_i::~TAO_PrimaryKeyDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_PrimaryKeyDef_i::def_kind (CORBA::Environment &)
+TAO_PrimaryKeyDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_PrimaryKey;
 }
 
-void 
-TAO_PrimaryKeyDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_PrimaryKeyDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_PrimaryKeyDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_PrimaryKeyDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_PrimaryKeyDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_PrimaryKeyDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_PrimaryKeyDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_PrimaryKeyDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-CORBA::Boolean 
-TAO_PrimaryKeyDef_i::is_a (const char *primary_key_id,
-                           CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_PrimaryKeyDef_i::is_a (const char *primary_key_id
+                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->is_a_i (primary_key_id,
-                       ACE_TRY_ENV);
+  return this->is_a_i (primary_key_id
+                       TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA::Boolean 
-TAO_PrimaryKeyDef_i::is_a_i (const char * /* primary_key_id */,
-                             CORBA::Environment & /* ACE_TRY_ENV */ )
+CORBA::Boolean
+TAO_PrimaryKeyDef_i::is_a_i (const char * /* primary_key_id */
+                             TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-CORBA_ValueDef_ptr 
-TAO_PrimaryKeyDef_i::primary_key (CORBA::Environment &ACE_TRY_ENV)
+CORBA_ValueDef_ptr
+TAO_PrimaryKeyDef_i::primary_key (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_ValueDef::_nil ());
 
-  return this->primary_key_i (ACE_TRY_ENV);
+  return this->primary_key_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_ValueDef_ptr 
-TAO_PrimaryKeyDef_i::primary_key_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA_ValueDef_ptr
+TAO_PrimaryKeyDef_i::primary_key_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.h b/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.h
index ed34c1fe4e5..4c937962cf7 100644
--- a/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.h
@@ -52,63 +52,54 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::Boolean is_a (
-      const char *primary_key_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *primary_key_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
-      const char *primary_key_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *primary_key_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ValueDef_ptr primary_key (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ValueDef_ptr primary_key_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp
index 448f9c904de..f6343693d55 100644
--- a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp
@@ -20,37 +20,37 @@ TAO_PrimitiveDef_i::~TAO_PrimitiveDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_PrimitiveDef_i::def_kind (CORBA::Environment &)
+TAO_PrimitiveDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Primitive;
 }
 
 void 
-TAO_PrimitiveDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_PrimitiveDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void 
-TAO_PrimitiveDef_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_PrimitiveDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW (CORBA::BAD_INV_ORDER (2, CORBA::COMPLETED_NO));
 }
 
 CORBA::TypeCode_ptr 
-TAO_PrimitiveDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+TAO_PrimitiveDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr 
-TAO_PrimitiveDef_i::type_i (CORBA::Environment &)
+TAO_PrimitiveDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int pkind = 0;
@@ -110,16 +110,16 @@ TAO_PrimitiveDef_i::type_i (CORBA::Environment &)
 }
 
 CORBA::PrimitiveKind 
-TAO_PrimitiveDef_i::kind (CORBA::Environment &ACE_TRY_ENV)
+TAO_PrimitiveDef_i::kind (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::pk_null);
 
-  return this->kind_i (ACE_TRY_ENV);
+  return this->kind_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::PrimitiveKind 
-TAO_PrimitiveDef_i::kind_i (CORBA::Environment &)
+TAO_PrimitiveDef_i::kind_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int pkind = 0;
diff --git a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h
index 4d847356aec..93bd5663df3 100644
--- a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h
@@ -50,50 +50,43 @@ public:
   // Destructor.
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // May not be called on a primitive kind - raises BAD_INV_ORDER.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Must implement this here because it's pure virtual in the
   // base class.
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::PrimitiveKind kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::PrimitiveKind kind_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp b/TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp
index 065b4722ece..67d87d93f3a 100644
--- a/TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp
@@ -20,39 +20,39 @@ TAO_ProvidesDef_i::~TAO_ProvidesDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ProvidesDef_i::def_kind (CORBA::Environment &)
+TAO_ProvidesDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Provides;
 }
 
 void 
-TAO_ProvidesDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_ProvidesDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void 
-TAO_ProvidesDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ProvidesDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_ProvidesDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_ProvidesDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_ProvidesDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ProvidesDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -60,16 +60,16 @@ TAO_ProvidesDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */)
 }
 
 CORBA_InterfaceDef_ptr 
-TAO_ProvidesDef_i::interface_type (CORBA::Environment &ACE_TRY_ENV)
+TAO_ProvidesDef_i::interface_type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_InterfaceDef::_nil ());
 
-  return this->interface_type_i (ACE_TRY_ENV);
+  return this->interface_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_InterfaceDef_ptr 
-TAO_ProvidesDef_i::interface_type_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ProvidesDef_i::interface_type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/ProvidesDef_i.h b/TAO/orbsvcs/IFR_Service/ProvidesDef_i.h
index 638bd7b82af..519bb360a63 100644
--- a/TAO/orbsvcs/IFR_Service/ProvidesDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/ProvidesDef_i.h
@@ -50,49 +50,42 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_InterfaceDef_ptr interface_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_InterfaceDef_ptr interface_type_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp b/TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp
index e902fb59289..3010f401007 100644
--- a/TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp
@@ -21,39 +21,39 @@ TAO_PublishesDef_i::~TAO_PublishesDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_PublishesDef_i::def_kind (CORBA::Environment &)
+TAO_PublishesDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Publishes;
 }
 
 void 
-TAO_PublishesDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_PublishesDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void 
-TAO_PublishesDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_PublishesDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_PublishesDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_PublishesDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_PublishesDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_PublishesDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/PublishesDef_i.h b/TAO/orbsvcs/IFR_Service/PublishesDef_i.h
index 6272ca66317..6e68f4b1f91 100644
--- a/TAO/orbsvcs/IFR_Service/PublishesDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/PublishesDef_i.h
@@ -51,36 +51,31 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 };
diff --git a/TAO/orbsvcs/IFR_Service/Repository_i.cpp b/TAO/orbsvcs/IFR_Service/Repository_i.cpp
index 74473273697..f0bddca277e 100644
--- a/TAO/orbsvcs/IFR_Service/Repository_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/Repository_i.cpp
@@ -47,15 +47,15 @@ TAO_Repository_i::TAO_Repository_i (CORBA::ORB_ptr orb,
 
       // Resolve and narrow the TypeCodeFactory.
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("TypeCodeFactory",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("TypeCodeFactory"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!CORBA::is_nil (object.in ()))
         {
           this->tc_factory_ =
-            CORBA::TypeCodeFactory::_narrow (object.in (),
-                                             ACE_TRY_ENV);
+            CORBA::TypeCodeFactory::_narrow (object.in ()
+                                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (this->tc_factory_.in ()))
@@ -215,33 +215,33 @@ TAO_Repository_i::~TAO_Repository_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_Repository_i::def_kind (CORBA::Environment &)
+TAO_Repository_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Repository;
 }
 
 void
-TAO_Repository_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_Repository_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW (CORBA::BAD_INV_ORDER (2, CORBA::COMPLETED_NO));
 }
 
 CORBA_Contained_ptr
-TAO_Repository_i::lookup_id (const char *search_id,
-                             CORBA::Environment &ACE_TRY_ENV)
+TAO_Repository_i::lookup_id (const char *search_id
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_Contained::_nil ());
 
-  return this->lookup_id_i (search_id,
-                            ACE_TRY_ENV);
+  return this->lookup_id_i (search_id
+                            TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_Contained_ptr
-TAO_Repository_i::lookup_id_i (const char *search_id,
-                               CORBA::Environment &ACE_TRY_ENV)
+TAO_Repository_i::lookup_id_i (const char *search_id
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (search_id, "IDL:omg.org/CORBA/Object:1.0") == 0
@@ -269,36 +269,36 @@ TAO_Repository_i::lookup_id_i (const char *search_id,
                                     "def_kind",
                                     kind);
 
-  CORBA::DefinitionKind def_kind = 
+  CORBA::DefinitionKind def_kind =
     ACE_static_cast (CORBA::DefinitionKind, kind);
 
   CORBA::Object_var obj =
     this->servant_factory_->create_objref (def_kind,
-                                           path.c_str (),
-                                           ACE_TRY_ENV);
+                                           path.c_str ()
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_Contained::_nil ());
 
-  return CORBA_Contained::_narrow (obj.in (),
-                                   ACE_TRY_ENV);
+  return CORBA_Contained::_narrow (obj.in ()
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
-TAO_Repository_i::get_canonical_typecode (CORBA::TypeCode_ptr tc,
-                                          CORBA::Environment &ACE_TRY_ENV)
+TAO_Repository_i::get_canonical_typecode (CORBA::TypeCode_ptr tc
+                                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->get_canonical_typecode_i (tc,
-                                         ACE_TRY_ENV);
+  return this->get_canonical_typecode_i (tc
+                                         TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
-TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc,
-                                            CORBA::Environment &ACE_TRY_ENV)
+TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc
+                                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
+  CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   switch (kind)
@@ -310,37 +310,37 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc,
       ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
     case CORBA::tk_array:
     {
-      CORBA::ULong length = tc->length (ACE_TRY_ENV);
+      CORBA::ULong length = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
-      CORBA::TypeCode_var ctype = tc->content_type (ACE_TRY_ENV);
+      CORBA::TypeCode_var ctype = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
       CORBA::TypeCode_var canon_ctype =
-        this->get_canonical_typecode_i (ctype.in (),
-                                        ACE_TRY_ENV);
+        this->get_canonical_typecode_i (ctype.in ()
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
       return this->tc_factory ()->create_array_tc (length,
-                                                   canon_ctype.in (),
-                                                   ACE_TRY_ENV);
+                                                   canon_ctype.in ()
+                                                   TAO_ENV_ARG_PARAMETER);
     }
     case CORBA::tk_sequence:
     {
-      CORBA::ULong length = tc->length (ACE_TRY_ENV);
+      CORBA::ULong length = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
-      CORBA::TypeCode_var ctype = tc->content_type (ACE_TRY_ENV);
+      CORBA::TypeCode_var ctype = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
       CORBA::TypeCode_var canon_ctype =
-        this->get_canonical_typecode_i (ctype.in (),
-                                        ACE_TRY_ENV);
+        this->get_canonical_typecode_i (ctype.in ()
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
       return this->tc_factory ()->create_sequence_tc (length,
-                                                      canon_ctype.in (),
-                                                      ACE_TRY_ENV);
+                                                      canon_ctype.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
     }
     case CORBA::tk_alias:
     case CORBA::tk_objref:
@@ -355,7 +355,7 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc,
     case CORBA::tk_component:
     case CORBA::tk_home:
     {
-      CORBA::String_var id = tc->id (ACE_TRY_ENV);
+      CORBA::String_var id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
       ACE_TString path;
@@ -381,26 +381,26 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc,
           TAO_ExceptionDef_i impl (this,
                                    key);
 
-          return impl.type_i (ACE_TRY_ENV);
+          return impl.type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
         }
       else
         {
           TAO_IDLType_i *impl =
-            this->servant_factory ()->create_idltype (key,
-                                                      ACE_TRY_ENV);
+            this->servant_factory ()->create_idltype (key
+                                                      TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
           auto_ptr<TAO_IDLType_i> safety (impl);
 
-          return impl->type_i (ACE_TRY_ENV);
+          return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
         }
     }
   }
 }
 
 CORBA_PrimitiveDef_ptr
-TAO_Repository_i::get_primitive (CORBA::PrimitiveKind kind,
-                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_Repository_i::get_primitive (CORBA::PrimitiveKind kind
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString obj_id ("pkinds\\");
@@ -409,28 +409,28 @@ TAO_Repository_i::get_primitive (CORBA::PrimitiveKind kind,
 
   CORBA::Object_var obj =
     this->servant_factory_->create_objref (CORBA::dk_Primitive,
-                                           obj_id.c_str (),
-                                           ACE_TRY_ENV);
+                                           obj_id.c_str ()
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_PrimitiveDef::_nil ());
 
-  return CORBA_PrimitiveDef::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+  return CORBA_PrimitiveDef::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_StringDef_ptr
-TAO_Repository_i::create_string (CORBA::ULong bound,
-                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_Repository_i::create_string (CORBA::ULong bound
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_StringDef::_nil ());
 
-  return this->create_string_i (bound,
-                                ACE_TRY_ENV);
+  return this->create_string_i (bound
+                                TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_StringDef_ptr
-TAO_Repository_i::create_string_i (CORBA::ULong bound,
-                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_Repository_i::create_string_i (CORBA::ULong bound
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int count = 0;
@@ -468,28 +468,28 @@ TAO_Repository_i::create_string_i (CORBA::ULong bound,
 
   CORBA::Object_var obj =
     this->servant_factory_->create_objref (CORBA::dk_String,
-                                           obj_id.c_str (),
-                                           ACE_TRY_ENV);
+                                           obj_id.c_str ()
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_StringDef::_nil ());
 
-  return CORBA_StringDef::_narrow (obj.in (),
-                                   ACE_TRY_ENV);
+  return CORBA_StringDef::_narrow (obj.in ()
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_WstringDef_ptr
-TAO_Repository_i::create_wstring (CORBA::ULong bound,
-                                  CORBA::Environment &ACE_TRY_ENV)
+TAO_Repository_i::create_wstring (CORBA::ULong bound
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_WstringDef::_nil ());
 
-  return this->create_wstring_i (bound,
-                                 ACE_TRY_ENV);
+  return this->create_wstring_i (bound
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_WstringDef_ptr
-TAO_Repository_i::create_wstring_i (CORBA::ULong bound,
-                                    CORBA::Environment &ACE_TRY_ENV)
+TAO_Repository_i::create_wstring_i (CORBA::ULong bound
+                                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int count = 0;
@@ -527,36 +527,36 @@ TAO_Repository_i::create_wstring_i (CORBA::ULong bound,
 
   CORBA::Object_var obj =
     this->servant_factory_->create_objref (CORBA::dk_Wstring,
-                                           obj_id.c_str (),
-                                           ACE_TRY_ENV);
+                                           obj_id.c_str ()
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_WstringDef::_nil ());
 
-  return CORBA_WstringDef::_narrow (obj.in (),
-                                    ACE_TRY_ENV);
+  return CORBA_WstringDef::_narrow (obj.in ()
+                                    TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_SequenceDef_ptr
 TAO_Repository_i::create_sequence (CORBA::ULong bound,
-                                   CORBA_IDLType_ptr element_type,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   CORBA_IDLType_ptr element_type
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_SequenceDef::_nil ());
 
   return this->create_sequence_i (bound,
-                                  element_type,
-                                  ACE_TRY_ENV);
+                                  element_type
+                                  TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_SequenceDef_ptr
 TAO_Repository_i::create_sequence_i (CORBA::ULong bound,
-                                     CORBA_IDLType_ptr element_type,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     CORBA_IDLType_ptr element_type
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var oid =
-    this->ir_poa_->reference_to_id (element_type,
-                                    ACE_TRY_ENV);
+    this->ir_poa_->reference_to_id (element_type
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_SequenceDef::_nil ());
 
   CORBA::String_var element_path =
@@ -605,36 +605,36 @@ TAO_Repository_i::create_sequence_i (CORBA::ULong bound,
 
   CORBA::Object_var obj =
     this->servant_factory_->create_objref (CORBA::dk_Sequence,
-                                           obj_id.c_str (),
-                                           ACE_TRY_ENV);
+                                           obj_id.c_str ()
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_SequenceDef::_nil ());
 
-  return CORBA_SequenceDef::_narrow (obj.in (),
-                                     ACE_TRY_ENV);
+  return CORBA_SequenceDef::_narrow (obj.in ()
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ArrayDef_ptr
 TAO_Repository_i::create_array (CORBA::ULong length,
-                                CORBA_IDLType_ptr element_type,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA_IDLType_ptr element_type
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_ArrayDef::_nil ());
 
   return this->create_array_i (length,
-                               element_type,
-                               ACE_TRY_ENV);
+                               element_type
+                               TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ArrayDef_ptr
 TAO_Repository_i::create_array_i (CORBA::ULong length,
-                                  CORBA_IDLType_ptr element_type,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA_IDLType_ptr element_type
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var oid =
-    this->ir_poa_->reference_to_id (element_type,
-                                    ACE_TRY_ENV);
+    this->ir_poa_->reference_to_id (element_type
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ArrayDef::_nil ());
 
   CORBA::String_var element_path =
@@ -683,31 +683,31 @@ TAO_Repository_i::create_array_i (CORBA::ULong length,
 
   CORBA::Object_var obj =
     this->servant_factory_->create_objref (CORBA::dk_Array,
-                                           obj_id.c_str (),
-                                           ACE_TRY_ENV);
+                                           obj_id.c_str ()
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ArrayDef::_nil ());
 
-  return CORBA_ArrayDef::_narrow (obj.in (),
-                                  ACE_TRY_ENV);
+  return CORBA_ArrayDef::_narrow (obj.in ()
+                                  TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_FixedDef_ptr
 TAO_Repository_i::create_fixed (CORBA::UShort digits,
-                                CORBA::Short scale,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Short scale
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_FixedDef::_nil ());
 
   return this->create_fixed_i (digits,
-                               scale,
-                               ACE_TRY_ENV);
+                               scale
+                               TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_FixedDef_ptr
 TAO_Repository_i::create_fixed_i (CORBA::UShort /* digits */,
-                                  CORBA::Short /* scale */,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Short /* scale */
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA_FixedDef::_nil ());
diff --git a/TAO/orbsvcs/IFR_Service/Repository_i.h b/TAO/orbsvcs/IFR_Service/Repository_i.h
index 74742ed7e91..57afd79f4fc 100644
--- a/TAO/orbsvcs/IFR_Service/Repository_i.h
+++ b/TAO/orbsvcs/IFR_Service/Repository_i.h
@@ -58,130 +58,113 @@ public:
   // Destructor.
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Accessor for the readonly attribute.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // May not be called on a repository - raises BAD_INV_ORDER.
 
   virtual CORBA_Contained_ptr lookup_id (
-      const char *search_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      const char *search_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_Contained_ptr lookup_id_i (
-      const char *search_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      const char *search_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr get_canonical_typecode (
-      CORBA::TypeCode_ptr tc,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::TypeCode_ptr tc
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr get_canonical_typecode_i (
-      CORBA::TypeCode_ptr tc,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::TypeCode_ptr tc
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::PrimitiveDef_ptr get_primitive (
-      CORBA::PrimitiveKind kind,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::PrimitiveKind kind
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC (( CORBA::SystemException));
   // No locking necessary because the database is not
   // accessed.
 
   virtual CORBA_StringDef_ptr create_string (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_StringDef_ptr create_string_i (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_WstringDef_ptr create_wstring (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_WstringDef_ptr create_wstring_i (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_SequenceDef_ptr create_sequence (
       CORBA::ULong bound,
-      CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC (( CORBA::SystemException));
 
   CORBA_SequenceDef_ptr create_sequence_i (
       CORBA::ULong bound,
-      CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC (( CORBA::SystemException));
 
   virtual CORBA_ArrayDef_ptr create_array (
       CORBA::ULong length,
-      CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ArrayDef_ptr create_array_i (
       CORBA::ULong length,
-      CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_FixedDef_ptr create_fixed (
       CORBA::UShort digits,
-      CORBA::Short scale,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::Short scale
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_FixedDef_ptr create_fixed_i (
       CORBA::UShort digits,
-      CORBA::Short scale,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::Short scale
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::POA_ptr ir_poa (void) const;
diff --git a/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp b/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp
index 0e6e59951f2..b60466363bc 100644
--- a/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp
@@ -22,27 +22,27 @@ TAO_SequenceDef_i::~TAO_SequenceDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_SequenceDef_i::def_kind (CORBA::Environment &)
+TAO_SequenceDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Sequence;
 }
 
-void 
-TAO_SequenceDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_SequenceDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_SequenceDef_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_SequenceDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Only if it is (w)string, fixed, array or sequence.
-  this->destroy_element_type (ACE_TRY_ENV);
+  this->destroy_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_TString name;
@@ -55,44 +55,44 @@ TAO_SequenceDef_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
                                           0);
 }
 
-CORBA::TypeCode_ptr 
-TAO_SequenceDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_SequenceDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_SequenceDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_SequenceDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::TypeCode_var element_typecode =
-    this->element_type_i (ACE_TRY_ENV);
+    this->element_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
-  CORBA::ULong bound = this->bound_i (ACE_TRY_ENV);
+  CORBA::ULong bound = this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return this->repo_->tc_factory ()->create_sequence_tc (
                                          bound,
-                                         element_typecode.in (),
-                                         ACE_TRY_ENV
+                                         element_typecode.in ()
+                                         TAO_ENV_ARG_PARAMETER
                                        );
 }
 
-CORBA::ULong 
-TAO_SequenceDef_i::bound (CORBA::Environment &ACE_TRY_ENV)
+CORBA::ULong
+TAO_SequenceDef_i::bound (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->bound_i (ACE_TRY_ENV);
+  return this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::ULong 
-TAO_SequenceDef_i::bound_i (CORBA::Environment &)
+CORBA::ULong
+TAO_SequenceDef_i::bound_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int bound = 0;
@@ -103,20 +103,20 @@ TAO_SequenceDef_i::bound_i (CORBA::Environment &)
   return ACE_static_cast (CORBA::ULong, bound);
 }
 
-void 
-TAO_SequenceDef_i::bound (CORBA::ULong bound,
-                          CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_SequenceDef_i::bound (CORBA::ULong bound
+                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->bound_i (bound,
-                 ACE_TRY_ENV);
+  this->bound_i (bound
+                 TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_SequenceDef_i::bound_i (CORBA::ULong bound,
-                            CORBA::Environment &)
+void
+TAO_SequenceDef_i::bound_i (CORBA::ULong bound
+                            TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
@@ -124,17 +124,17 @@ TAO_SequenceDef_i::bound_i (CORBA::ULong bound,
                                              bound);
 }
 
-CORBA::TypeCode_ptr 
-TAO_SequenceDef_i::element_type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_SequenceDef_i::element_type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->element_type_i (ACE_TRY_ENV);
+  return this->element_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_SequenceDef_i::element_type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_SequenceDef_i::element_type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString element_path;
@@ -149,26 +149,26 @@ TAO_SequenceDef_i::element_type_i (CORBA::Environment &ACE_TRY_ENV)
                                        0);
 
   TAO_IDLType_i *impl =
-    this->repo_->servant_factory ()->create_idltype (element_key,
-                                                     ACE_TRY_ENV);
+    this->repo_->servant_factory ()->create_idltype (element_key
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   auto_ptr<TAO_IDLType_i> safety (impl);
 
-  return impl->type_i (ACE_TRY_ENV);
+  return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_IDLType_ptr 
-TAO_SequenceDef_i::element_type_def (CORBA::Environment &ACE_TRY_ENV)
+CORBA_IDLType_ptr
+TAO_SequenceDef_i::element_type_def (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ());
 
-  return this->element_type_def_i (ACE_TRY_ENV);
+  return this->element_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_IDLType_ptr 
-TAO_SequenceDef_i::element_type_def_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA_IDLType_ptr
+TAO_SequenceDef_i::element_type_def_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString element_path;
@@ -187,41 +187,41 @@ TAO_SequenceDef_i::element_type_def_i (CORBA::Environment &ACE_TRY_ENV)
                                              "def_kind",
                                              kind);
 
-  CORBA::DefinitionKind def_kind = 
+  CORBA::DefinitionKind def_kind =
     ACE_static_cast (CORBA::DefinitionKind, kind);
 
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (def_kind,
-                                                    element_path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    element_path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
 
-  return CORBA_IDLType::_narrow (obj.in (),
-                                 ACE_TRY_ENV);
+  return CORBA_IDLType::_narrow (obj.in ()
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_SequenceDef_i::element_type_def (CORBA_IDLType_ptr element_type_def,
-                                     CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_SequenceDef_i::element_type_def (CORBA_IDLType_ptr element_type_def
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->element_type_def_i (element_type_def,
-                            ACE_TRY_ENV);
+  this->element_type_def_i (element_type_def
+                            TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_SequenceDef_i::element_type_def_i (CORBA_IDLType_ptr element_type_def,
-                                       CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_SequenceDef_i::element_type_def_i (CORBA_IDLType_ptr element_type_def
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->destroy_element_type (ACE_TRY_ENV);
+  this->destroy_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var oid =
-    this->repo_->ir_poa ()->reference_to_id (element_type_def,
-                                             ACE_TRY_ENV);
+    this->repo_->ir_poa ()->reference_to_id (element_type_def
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var element_path =
@@ -232,9 +232,9 @@ TAO_SequenceDef_i::element_type_def_i (CORBA_IDLType_ptr element_type_def,
                                             element_path.in ());
 }
 
-void 
+void
 TAO_SequenceDef_i::destroy_element_type (
-      CORBA::Environment &ACE_TRY_ENV)
+      TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString element_path;
@@ -268,13 +268,13 @@ TAO_SequenceDef_i::destroy_element_type (
     case CORBA::dk_Sequence:
     {
       TAO_IDLType_i *impl =
-        this->repo_->servant_factory ()->create_idltype (element_key,
-                                                         ACE_TRY_ENV);
+        this->repo_->servant_factory ()->create_idltype (element_key
+                                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       auto_ptr<TAO_IDLType_i> safety (impl);
 
-      impl->destroy_i (ACE_TRY_ENV);
+      impl->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       break;
diff --git a/TAO/orbsvcs/IFR_Service/SequenceDef_i.h b/TAO/orbsvcs/IFR_Service/SequenceDef_i.h
index a798c09113b..061e91adc6e 100644
--- a/TAO/orbsvcs/IFR_Service/SequenceDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/SequenceDef_i.h
@@ -50,108 +50,92 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::ULong bound (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ULong bound_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void bound (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void bound_i (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr element_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr element_type_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_IDLType_ptr element_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_IDLType_ptr element_type_def_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void element_type_def (
-      CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void element_type_def_i (
-      CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   void destroy_element_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroys an anonymous non-primitive element type.
 };
diff --git a/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp b/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp
index 6c002c7d972..7b168fb9cb0 100644
--- a/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp
+++ b/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp
@@ -14,8 +14,8 @@ IFR_Servant_Factory::IFR_Servant_Factory (TAO_Repository_i *repo)
 
 TAO_IDLType_i *
 IFR_Servant_Factory::create_idltype (
-    ACE_Configuration_Section_Key servant_key,
-    CORBA::Environment &ACE_TRY_ENV
+    ACE_Configuration_Section_Key servant_key
+    TAO_ENV_ARG_DECL
   )
 {
   u_int def_kind = 0;
@@ -230,8 +230,8 @@ IFR_Servant_Factory::create_idltype (
 
 TAO_Contained_i *
 IFR_Servant_Factory::create_contained (
-    ACE_Configuration_Section_Key servant_key,
-    CORBA::Environment &ACE_TRY_ENV
+    ACE_Configuration_Section_Key servant_key
+    TAO_ENV_ARG_DECL
   )
 {
   u_int def_kind = 0;
@@ -512,8 +512,8 @@ IFR_Servant_Factory::create_contained (
 
 TAO_Container_i *
 IFR_Servant_Factory::create_container (
-    ACE_Configuration_Section_Key servant_key,
-    CORBA::Environment &ACE_TRY_ENV
+    ACE_Configuration_Section_Key servant_key
+    TAO_ENV_ARG_DECL
   )
 {
   u_int def_kind = 0;
@@ -638,11 +638,11 @@ IFR_Servant_Factory::create_container (
   }
 }
 
-PortableServer::Servant 
+PortableServer::Servant
 IFR_Servant_Factory::create_tie (
     ACE_Configuration_Section_Key servant_key,
-    PortableServer::POA_ptr poa,
-    CORBA::Environment &ACE_TRY_ENV
+    PortableServer::POA_ptr poa
+    TAO_ENV_ARG_DECL
   )
 {
   u_int def_kind = 0;
@@ -1367,10 +1367,10 @@ IFR_Servant_Factory::create_tie (
   }
 }
 
-CORBA::Object_ptr 
+CORBA::Object_ptr
 IFR_Servant_Factory::create_objref (CORBA::DefinitionKind def_kind,
-                                    const char *obj_id,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    const char *obj_id
+                                    TAO_ENV_ARG_DECL)
 {
   PortableServer::ObjectId_var oid =
     PortableServer::string_to_ObjectId (obj_id);
@@ -1487,6 +1487,6 @@ IFR_Servant_Factory::create_objref (CORBA::DefinitionKind def_kind,
   repo_id += "1.0";
 
   return this->repo_->ir_poa ()->create_reference_with_id (oid.in (),
-                                                           repo_id.c_str (),
-                                                           ACE_TRY_ENV);
+                                                           repo_id.c_str ()
+                                                           TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/IFR_Service/Servant_Factory.h b/TAO/orbsvcs/IFR_Service/Servant_Factory.h
index 3b3716ed4ef..8c2657f65d3 100644
--- a/TAO/orbsvcs/IFR_Service/Servant_Factory.h
+++ b/TAO/orbsvcs/IFR_Service/Servant_Factory.h
@@ -46,29 +46,29 @@ public:
   IFR_Servant_Factory (TAO_Repository_i *repo);
   // constructor
 
-  TAO_IDLType_i *create_idltype (ACE_Configuration_Section_Key key,
-                                 CORBA::Environment &ACE_TRY_ENV);
+  TAO_IDLType_i *create_idltype (ACE_Configuration_Section_Key key
+                                 TAO_ENV_ARG_DECL);
   // For internal use - faster than creating an object reference and
   // sending a request, and can call utility functions not in IDL.
 
-  TAO_Contained_i *create_contained (ACE_Configuration_Section_Key key,
-                                     CORBA::Environment &ACE_TRY_ENV);
+  TAO_Contained_i *create_contained (ACE_Configuration_Section_Key key
+                                     TAO_ENV_ARG_DECL);
   // For internal use - faster than creating an object reference and
   // sending a request, and can call utility functions not in IDL.
 
-  TAO_Container_i *create_container (ACE_Configuration_Section_Key key,
-                                     CORBA::Environment &ACE_TRY_ENV);
+  TAO_Container_i *create_container (ACE_Configuration_Section_Key key
+                                     TAO_ENV_ARG_DECL);
   // For internal use - faster than creating an object reference and
   // sending a request, and can call utility functions not in IDL.
 
   PortableServer::Servant create_tie (ACE_Configuration_Section_Key key,
-                                      PortableServer::POA_ptr poa,
-                                      CORBA::Environment &ACE_TRY_ENV);
+                                      PortableServer::POA_ptr poa
+                                      TAO_ENV_ARG_DECL);
   // Used by the servant locator to create a servant.
 
   CORBA::Object_ptr create_objref (CORBA::DefinitionKind def_kind,
-                                   const char *obj_id,
-                                   CORBA::Environment &ACE_TRY_ENV);
+                                   const char *obj_id
+                                   TAO_ENV_ARG_DECL);
   // Used to create return values.
 private:
   TAO_Repository_i *repo_;
diff --git a/TAO/orbsvcs/IFR_Service/Servant_Locator.cpp b/TAO/orbsvcs/IFR_Service/Servant_Locator.cpp
index a99049cf31d..effbe438f55 100644
--- a/TAO/orbsvcs/IFR_Service/Servant_Locator.cpp
+++ b/TAO/orbsvcs/IFR_Service/Servant_Locator.cpp
@@ -22,8 +22,6 @@ IFR_ServantLocator::preinvoke (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
-
   CORBA::String_var s =
     PortableServer::ObjectId_to_string (oid);
 
@@ -42,8 +40,8 @@ IFR_ServantLocator::preinvoke (
 
   PortableServer::Servant servant =
     this->repo_->servant_factory ()->create_tie (servant_key,
-                                                 poa,
-                                                 ACE_TRY_ENV);
+                                                 poa
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   cookie = servant;
diff --git a/TAO/orbsvcs/IFR_Service/StringDef_i.cpp b/TAO/orbsvcs/IFR_Service/StringDef_i.cpp
index 21e7065a316..c84ee3c3fa5 100644
--- a/TAO/orbsvcs/IFR_Service/StringDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/StringDef_i.cpp
@@ -18,23 +18,23 @@ TAO_StringDef_i::~TAO_StringDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_StringDef_i::def_kind (CORBA::Environment &)
+TAO_StringDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_String;
 }
 
-void 
-TAO_StringDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_StringDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_StringDef_i::destroy_i (CORBA::Environment &)
+void
+TAO_StringDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString name;
@@ -47,39 +47,39 @@ TAO_StringDef_i::destroy_i (CORBA::Environment &)
                                           0);
 }
 
-CORBA::TypeCode_ptr 
-TAO_StringDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_StringDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_StringDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_StringDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::ULong bound = this->bound_i (ACE_TRY_ENV);
+  CORBA::ULong bound = this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return this->repo_->tc_factory ()->create_string_tc (
-                                         bound,
-                                         ACE_TRY_ENV
+                                         bound
+                                         TAO_ENV_ARG_PARAMETER
                                        );
 }
 
-CORBA::ULong 
-TAO_StringDef_i::bound (CORBA::Environment &ACE_TRY_ENV)
+CORBA::ULong
+TAO_StringDef_i::bound (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->bound_i (ACE_TRY_ENV);
+  return this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::ULong 
-TAO_StringDef_i::bound_i (CORBA::Environment &)
+CORBA::ULong
+TAO_StringDef_i::bound_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int retval = 0;
@@ -90,20 +90,20 @@ TAO_StringDef_i::bound_i (CORBA::Environment &)
   return ACE_static_cast (CORBA::ULong, retval);
 }
 
-void 
-TAO_StringDef_i::bound (CORBA::ULong bound,
-                        CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_StringDef_i::bound (CORBA::ULong bound
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->bound_i (bound,
-                 ACE_TRY_ENV);
+  this->bound_i (bound
+                 TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_StringDef_i::bound_i (CORBA::ULong bound,
-                          CORBA::Environment &)
+void
+TAO_StringDef_i::bound_i (CORBA::ULong bound
+                          TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
diff --git a/TAO/orbsvcs/IFR_Service/StringDef_i.h b/TAO/orbsvcs/IFR_Service/StringDef_i.h
index 336408ee467..4ed4bb83f14 100644
--- a/TAO/orbsvcs/IFR_Service/StringDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/StringDef_i.h
@@ -51,63 +51,54 @@ public:
   // Destructor.
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::ULong bound (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ULong bound_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void bound (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void bound_i (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/StructDef_i.cpp b/TAO/orbsvcs/IFR_Service/StructDef_i.cpp
index bf11eb3ef47..acb2883004c 100644
--- a/TAO/orbsvcs/IFR_Service/StructDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/StructDef_i.cpp
@@ -23,45 +23,45 @@ TAO_StructDef_i::~TAO_StructDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_StructDef_i::def_kind (CORBA::Environment &)
+TAO_StructDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Struct;
 }
 
-void 
-TAO_StructDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_StructDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_StructDef_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_StructDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our members.
-  TAO_Container_i::destroy_i (ACE_TRY_ENV);
+  TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-    
+
   // Destroy ourself.
-  TAO_Contained_i::destroy_i (ACE_TRY_ENV);
+  TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
-CORBA::TypeCode_ptr 
-TAO_StructDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_StructDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_StructDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_StructDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -74,26 +74,26 @@ TAO_StructDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
                                             "name",
                                             name);
 
-  CORBA_StructMemberSeq_var members = this->members_i (ACE_TRY_ENV);
+  CORBA_StructMemberSeq_var members = this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return this->repo_->tc_factory ()->create_struct_tc (id.c_str (),
                                                        name.c_str (),
-                                                       members.in (),
-                                                       ACE_TRY_ENV);
+                                                       members.in ()
+                                                       TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_StructMemberSeq *
-TAO_StructDef_i::members (CORBA::Environment &ACE_TRY_ENV)
+TAO_StructDef_i::members (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->members_i (ACE_TRY_ENV);
+  return this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_StructMemberSeq *
-TAO_StructDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_StructDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue;
@@ -149,7 +149,7 @@ TAO_StructDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
                                                      "def_kind",
                                                      kind);
 
-          CORBA::DefinitionKind def_kind = 
+          CORBA::DefinitionKind def_kind =
             ACE_static_cast (CORBA::DefinitionKind, kind);
 
           kind_queue.enqueue_tail (def_kind);
@@ -157,7 +157,7 @@ TAO_StructDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
     }
 
   size_t size = kind_queue.size ();
-                    
+
   CORBA_StructMemberSeq *members = 0;
   ACE_NEW_THROW_EX (members,
                     CORBA_StructMemberSeq (size),
@@ -184,14 +184,14 @@ TAO_StructDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
 
       path_queue.dequeue_head (path);
 
-      obj = 
+      obj =
         this->repo_->servant_factory ()->create_objref (kind,
-                                                        path.c_str (),
-                                                        ACE_TRY_ENV);
+                                                        path.c_str ()
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
-    
-      retval[k].type_def = CORBA_IDLType::_narrow (obj.in (),
-                                                   ACE_TRY_ENV);
+
+      retval[k].type_def = CORBA_IDLType::_narrow (obj.in ()
+                                                   TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       this->repo_->config ()->expand_path (this->repo_->root_key (),
@@ -200,37 +200,37 @@ TAO_StructDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
                                            0);
 
       impl =
-        this->repo_->servant_factory ()->create_idltype (member_key,
-                                                         ACE_TRY_ENV);
+        this->repo_->servant_factory ()->create_idltype (member_key
+                                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       auto_ptr<TAO_IDLType_i> safety (impl);
-    
-      retval[k].type = impl->type_i (ACE_TRY_ENV);
+
+      retval[k].type = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
   return retval._retn ();
 }
 
-void 
-TAO_StructDef_i::members (const CORBA_StructMemberSeq &members,
-                          CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_StructDef_i::members (const CORBA_StructMemberSeq &members
+                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->members_i (members,
-                   ACE_TRY_ENV);
+  this->members_i (members
+                   TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_StructDef_i::members_i (const CORBA_StructMemberSeq &members,
-                            CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_StructDef_i::members_i (const CORBA_StructMemberSeq &members
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our old members, both refs and defns.
-  TAO_Container_i::destroy_i (ACE_TRY_ENV);
+  TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong count = members.length ();
@@ -258,9 +258,9 @@ TAO_StructDef_i::members_i (const CORBA_StructMemberSeq &members,
                                                 "name",
                                                 members[i].name.in ());
 
-      PortableServer::ObjectId_var oid = 
-        this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in (),
-                                                 ACE_TRY_ENV);
+      PortableServer::ObjectId_var oid =
+        this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in ()
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::String_var path =
diff --git a/TAO/orbsvcs/IFR_Service/StructDef_i.h b/TAO/orbsvcs/IFR_Service/StructDef_i.h
index 47622dd3f76..0249cafeadc 100644
--- a/TAO/orbsvcs/IFR_Service/StructDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/StructDef_i.h
@@ -34,7 +34,7 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_StructDef_i : public virtual TAO_TypedefDef_i, 
+class TAO_StructDef_i : public virtual TAO_TypedefDef_i,
                         public virtual TAO_Container_i
 {
   // = TITLE
@@ -52,63 +52,54 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry and its contents.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA_StructMemberSeq *members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_StructMemberSeq *members_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void members (
-      const CORBA_StructMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void members_i (
-      const CORBA_StructMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp b/TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp
index 523d1c56536..859c5fa8359 100644
--- a/TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp
@@ -21,16 +21,16 @@ TAO_TypedefDef_i::~TAO_TypedefDef_i (void)
 }
 
 CORBA_Contained::Description *
-TAO_TypedefDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_TypedefDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_TypedefDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_TypedefDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_Contained::Description *desc_ptr = 0;
@@ -41,15 +41,15 @@ TAO_TypedefDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
 
   CORBA_Contained::Description_var retval = desc_ptr;
 
-  retval->kind = this->def_kind (ACE_TRY_ENV);
+  retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA_TypeDescription td;
 
   ACE_CHECK_RETURN (0);
-  td.name = this->name_i (ACE_TRY_ENV);
+  td.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 
-  td.id = this->id_i (ACE_TRY_ENV);
+  td.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_TString container_id;
@@ -60,10 +60,10 @@ TAO_TypedefDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
 
   td.defined_in = container_id.c_str ();
 
-  td.version = this->version_i (ACE_TRY_ENV);
+  td.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  td.type = this->type_i (ACE_TRY_ENV);
+  td.type = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   retval->value <<= td;
diff --git a/TAO/orbsvcs/IFR_Service/TypedefDef_i.h b/TAO/orbsvcs/IFR_Service/TypedefDef_i.h
index 9d66c140f1d..40e966cded2 100644
--- a/TAO/orbsvcs/IFR_Service/TypedefDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/TypedefDef_i.h
@@ -53,16 +53,14 @@ public:
   // Destructor
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 };
diff --git a/TAO/orbsvcs/IFR_Service/UnionDef_i.cpp b/TAO/orbsvcs/IFR_Service/UnionDef_i.cpp
index c1aa94e2243..4ca5f622103 100644
--- a/TAO/orbsvcs/IFR_Service/UnionDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/UnionDef_i.cpp
@@ -23,45 +23,45 @@ TAO_UnionDef_i::~TAO_UnionDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_UnionDef_i::def_kind (CORBA::Environment &)
+TAO_UnionDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Union;
 }
 
-void 
-TAO_UnionDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_UnionDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_UnionDef_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_UnionDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our members.
-  TAO_Container_i::destroy_i (ACE_TRY_ENV);
+  TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-    
+
   // Destroy ourself.
-  TAO_Contained_i::destroy_i (ACE_TRY_ENV);
+  TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
-CORBA::TypeCode_ptr 
-TAO_UnionDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_UnionDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_UnionDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_UnionDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -74,30 +74,30 @@ TAO_UnionDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
                                             "name",
                                             name);
 
-  CORBA::TypeCode_var tc = this->discriminator_type_i (ACE_TRY_ENV);
+  CORBA::TypeCode_var tc = this->discriminator_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
-  CORBA_UnionMemberSeq_var members = this->members_i (ACE_TRY_ENV);
+  CORBA_UnionMemberSeq_var members = this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return this->repo_->tc_factory ()->create_union_tc (id.c_str (),
                                                       name.c_str (),
                                                       tc.in (),
-                                                      members.in (),
-                                                      ACE_TRY_ENV);
+                                                      members.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_UnionDef_i::discriminator_type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_UnionDef_i::discriminator_type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->discriminator_type_i (ACE_TRY_ENV);
+  return this->discriminator_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_UnionDef_i::discriminator_type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_UnionDef_i::discriminator_type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString disc_path;
@@ -111,26 +111,26 @@ TAO_UnionDef_i::discriminator_type_i (CORBA::Environment &ACE_TRY_ENV)
                                        disc_key,
                                        0);
 
-  TAO_IDLType_i *impl = 
-    this->repo_->servant_factory ()->create_idltype (disc_key,
-                                                     ACE_TRY_ENV);
+  TAO_IDLType_i *impl =
+    this->repo_->servant_factory ()->create_idltype (disc_key
+                                                     TAO_ENV_ARG_PARAMETER);
 
   auto_ptr<TAO_IDLType_i> safety (impl);
 
-  return impl->type_i (ACE_TRY_ENV);
+  return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_IDLType_ptr 
-TAO_UnionDef_i::discriminator_type_def (CORBA::Environment &ACE_TRY_ENV)
+CORBA_IDLType_ptr
+TAO_UnionDef_i::discriminator_type_def (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ());
 
-  return this->discriminator_type_def_i (ACE_TRY_ENV);
+  return this->discriminator_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_IDLType_ptr 
-TAO_UnionDef_i::discriminator_type_def_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA_IDLType_ptr
+TAO_UnionDef_i::discriminator_type_def_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString disc_path;
@@ -154,41 +154,41 @@ TAO_UnionDef_i::discriminator_type_def_i (CORBA::Environment &ACE_TRY_ENV)
 
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (def_kind,
-                                                    disc_path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    disc_path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
 
-  return CORBA_IDLType::_narrow (obj.in (),
-                                 ACE_TRY_ENV);
+  return CORBA_IDLType::_narrow (obj.in ()
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
-void 
+void
 TAO_UnionDef_i::discriminator_type_def (
-    CORBA_IDLType_ptr discriminator_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr discriminator_type_def
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->discriminator_type_def_i (discriminator_type_def,
-                                  ACE_TRY_ENV);
+  this->discriminator_type_def_i (discriminator_type_def
+                                  TAO_ENV_ARG_PARAMETER);
 }
 
-void 
+void
 TAO_UnionDef_i::discriminator_type_def_i (
-    CORBA_IDLType_ptr discriminator_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr discriminator_type_def
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::ObjectId_var oid = 
-    this->repo_->ir_poa ()->reference_to_id (discriminator_type_def,
-                                             ACE_TRY_ENV);
+  PortableServer::ObjectId_var oid =
+    this->repo_->ir_poa ()->reference_to_id (discriminator_type_def
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var disc_path =
-    PortableServer::ObjectId_to_string (oid.in ());  
+    PortableServer::ObjectId_to_string (oid.in ());
 
   this->repo_->config ()->set_string_value (this->section_key_,
                                             "disc_path",
@@ -196,16 +196,16 @@ TAO_UnionDef_i::discriminator_type_def_i (
 }
 
 CORBA_UnionMemberSeq *
-TAO_UnionDef_i::members (CORBA::Environment &ACE_TRY_ENV)
+TAO_UnionDef_i::members (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->members_i (ACE_TRY_ENV);
+  return this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_UnionMemberSeq *
-TAO_UnionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_UnionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<ACE_Configuration_Section_Key> key_queue;
@@ -251,7 +251,7 @@ TAO_UnionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
     }
 
   size_t size = key_queue.size ();
-                    
+
   CORBA_UnionMemberSeq *members = 0;
   ACE_NEW_THROW_EX (members,
                     CORBA_UnionMemberSeq (size),
@@ -280,8 +280,8 @@ TAO_UnionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
       retval[k].name = name.c_str ();
 
       this->fetch_label (next_key,
-                         retval[k],
-                         ACE_TRY_ENV);
+                         retval[k]
+                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       this->repo_->config ()->get_string_value (next_key,
@@ -300,48 +300,48 @@ TAO_UnionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
       def_kind =
         ACE_static_cast (CORBA::DefinitionKind, kind);
 
-      obj = 
+      obj =
         this->repo_->servant_factory ()->create_objref (def_kind,
-                                                        path.c_str (),
-                                                        ACE_TRY_ENV);
+                                                        path.c_str ()
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
-    
-      retval[k].type_def = CORBA_IDLType::_narrow (obj.in (),
-                                                   ACE_TRY_ENV);
+
+      retval[k].type_def = CORBA_IDLType::_narrow (obj.in ()
+                                                   TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       impl =
-        this->repo_->servant_factory ()->create_idltype (entry_key,
-                                                         ACE_TRY_ENV);
+        this->repo_->servant_factory ()->create_idltype (entry_key
+                                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       auto_ptr<TAO_IDLType_i> safety (impl);
-    
-      retval[k].type = impl->type_i (ACE_TRY_ENV);
+
+      retval[k].type = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
   return retval._retn ();
 }
 
-void 
-TAO_UnionDef_i::members (const CORBA_UnionMemberSeq &members,
-                         CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_UnionDef_i::members (const CORBA_UnionMemberSeq &members
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->members_i (members,
-                   ACE_TRY_ENV);
+  this->members_i (members
+                   TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_UnionDef_i::members_i (const CORBA_UnionMemberSeq &members,
-                           CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_UnionDef_i::members_i (const CORBA_UnionMemberSeq &members
+                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our old members, both refs and defns.
-  TAO_Container_i::destroy_i (ACE_TRY_ENV);
+  TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_TString section_name;
@@ -373,9 +373,9 @@ TAO_UnionDef_i::members_i (const CORBA_UnionMemberSeq &members,
                                                 "name",
                                                 members[i].name.in ());
 
-      PortableServer::ObjectId_var oid = 
-        this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in (),
-                                                 ACE_TRY_ENV);
+      PortableServer::ObjectId_var oid =
+        this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in ()
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::String_var member_path =
@@ -386,15 +386,15 @@ TAO_UnionDef_i::members_i (const CORBA_UnionMemberSeq &members,
                                                 member_path.in ());
 
       this->store_label (member_key,
-                         members[i].label,
-                         ACE_TRY_ENV);
+                         members[i].label
+                         TAO_ENV_ARG_PARAMETER);
     }
 }
 
 void
 TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key,
-                             CORBA_UnionMember &member,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA_UnionMember &member
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration::VALUETYPE vt;
@@ -414,20 +414,20 @@ TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key,
                                              "label",
                                              value);
 
-  CORBA::TypeCode_var tc = this->discriminator_type_i (ACE_TRY_ENV);
+  CORBA::TypeCode_var tc = this->discriminator_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
+  CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   switch (kind)
   {
     case CORBA::tk_char:
-      member.label <<= CORBA::Any::from_char (ACE_static_cast (CORBA::Char, 
+      member.label <<= CORBA::Any::from_char (ACE_static_cast (CORBA::Char,
                                                                value));
       break;
     case CORBA::tk_wchar:
-      member.label <<= CORBA::Any::from_wchar (ACE_static_cast (CORBA::WChar, 
+      member.label <<= CORBA::Any::from_wchar (ACE_static_cast (CORBA::WChar,
                                                                 value));
       break;
     case CORBA::tk_boolean:
diff --git a/TAO/orbsvcs/IFR_Service/UnionDef_i.h b/TAO/orbsvcs/IFR_Service/UnionDef_i.h
index 61131bff37a..ea97eaae096 100644
--- a/TAO/orbsvcs/IFR_Service/UnionDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/UnionDef_i.h
@@ -34,7 +34,7 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_UnionDef_i : public virtual TAO_TypedefDef_i, 
+class TAO_UnionDef_i : public virtual TAO_TypedefDef_i,
                        public virtual TAO_Container_i
 {
   // = TITLE
@@ -52,110 +52,94 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry and its contents.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr discriminator_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr discriminator_type_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_IDLType_ptr discriminator_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_IDLType_ptr discriminator_type_def_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void discriminator_type_def (
-      CORBA_IDLType_ptr discriminator_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr discriminator_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void discriminator_type_def_i (
-      CORBA_IDLType_ptr discriminator_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr discriminator_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_UnionMemberSeq *members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_UnionMemberSeq *members_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void members (
-      const CORBA_UnionMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void members_i (
-      const CORBA_UnionMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   void fetch_label (
       const ACE_Configuration_Section_Key member_key,
-      CORBA_UnionMember &member,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_UnionMember &member
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Used by members() to get each member's label value.
 };
diff --git a/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp b/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp
index e9f793abaf6..e36bdaa2ee9 100644
--- a/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp
@@ -18,39 +18,39 @@ TAO_UsesDef_i::~TAO_UsesDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_UsesDef_i::def_kind (CORBA::Environment &)
+TAO_UsesDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Uses;
 }
 
 void 
-TAO_UsesDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_UsesDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void 
-TAO_UsesDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_UsesDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_UsesDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_UsesDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_UsesDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_UsesDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -58,16 +58,16 @@ TAO_UsesDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */)
 }
 
 CORBA_InterfaceDef_ptr 
-TAO_UsesDef_i::interface_type (CORBA::Environment &ACE_TRY_ENV)
+TAO_UsesDef_i::interface_type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_InterfaceDef::_nil ());
 
-  return this->interface_type_i (ACE_TRY_ENV);
+  return this->interface_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_InterfaceDef_ptr 
-TAO_UsesDef_i::interface_type_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_UsesDef_i::interface_type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -75,16 +75,16 @@ TAO_UsesDef_i::interface_type_i (CORBA::Environment & /* ACE_TRY_ENV */)
 }
 
 CORBA::Boolean 
-TAO_UsesDef_i::is_multiple (CORBA::Environment &ACE_TRY_ENV)
+TAO_UsesDef_i::is_multiple (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->is_multiple_i (ACE_TRY_ENV);
+  return this->is_multiple_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Boolean 
-TAO_UsesDef_i::is_multiple_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_UsesDef_i::is_multiple_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/UsesDef_i.h b/TAO/orbsvcs/IFR_Service/UsesDef_i.h
index a71572e0997..fae4dae86f8 100644
--- a/TAO/orbsvcs/IFR_Service/UsesDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/UsesDef_i.h
@@ -50,61 +50,52 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_InterfaceDef_ptr interface_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_InterfaceDef_ptr interface_type_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_multiple (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_multiple_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.cpp b/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.cpp
index e7e413bfc53..802bef26eca 100644
--- a/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.cpp
@@ -24,23 +24,23 @@ TAO_ValueBoxDef_i::~TAO_ValueBoxDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ValueBoxDef_i::def_kind (CORBA::Environment &)
+TAO_ValueBoxDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_ValueBox;
 }
 
-CORBA::TypeCode_ptr 
-TAO_ValueBoxDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_ValueBoxDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_ValueBoxDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_ValueBoxDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -65,32 +65,32 @@ TAO_ValueBoxDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
                                        0);
 
   TAO_IDLType_i *impl =
-    this->repo_->servant_factory ()->create_idltype (boxed_key,
-                                                     ACE_TRY_ENV);
+    this->repo_->servant_factory ()->create_idltype (boxed_key
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   auto_ptr<TAO_IDLType_i> safety (impl);
 
-  CORBA::TypeCode_var tc = impl->type_i (ACE_TRY_ENV);
+  CORBA::TypeCode_var tc = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return this->repo_->tc_factory ()->create_value_box_tc (id.c_str (),
                                                           name.c_str (),
-                                                          tc.in (),
-                                                          ACE_TRY_ENV);
+                                                          tc.in ()
+                                                          TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA_IDLType_ptr 
-TAO_ValueBoxDef_i::original_type_def (CORBA::Environment &ACE_TRY_ENV)
+CORBA_IDLType_ptr
+TAO_ValueBoxDef_i::original_type_def (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ());
 
-  return this->original_type_def_i (ACE_TRY_ENV);
+  return this->original_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_IDLType_ptr 
-TAO_ValueBoxDef_i::original_type_def_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA_IDLType_ptr
+TAO_ValueBoxDef_i::original_type_def_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString boxed_type;
@@ -109,38 +109,38 @@ TAO_ValueBoxDef_i::original_type_def_i (CORBA::Environment &ACE_TRY_ENV)
                                              "def_kind",
                                              kind);
 
-  CORBA::DefinitionKind def_kind = 
+  CORBA::DefinitionKind def_kind =
     ACE_static_cast (CORBA::DefinitionKind, kind);
 
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (def_kind,
-                                                    boxed_type.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    boxed_type.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
 
-  return CORBA_IDLType::_narrow (obj.in (),
-                                 ACE_TRY_ENV);
+  return CORBA_IDLType::_narrow (obj.in ()
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_ValueBoxDef_i::original_type_def (CORBA_IDLType_ptr original_type_def,
-                                      CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ValueBoxDef_i::original_type_def (CORBA_IDLType_ptr original_type_def
+                                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->original_type_def_i (original_type_def,
-                             ACE_TRY_ENV);
+  this->original_type_def_i (original_type_def
+                             TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_ValueBoxDef_i::original_type_def_i (CORBA_IDLType_ptr original_type_def,
-                                        CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ValueBoxDef_i::original_type_def_i (CORBA_IDLType_ptr original_type_def
+                                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var oid =
-    this->repo_->ir_poa ()->reference_to_id (original_type_def,
-                                             ACE_TRY_ENV);
+    this->repo_->ir_poa ()->reference_to_id (original_type_def
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var boxed_type =
diff --git a/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.h b/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.h
index ac54ddd5426..f477053a276 100644
--- a/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.h
@@ -51,50 +51,43 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA_IDLType_ptr original_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_IDLType_ptr original_type_def_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void original_type_def (
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void original_type_def_i (
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/ValueDef_i.cpp b/TAO/orbsvcs/IFR_Service/ValueDef_i.cpp
index 383de673459..1c41ea260f4 100644
--- a/TAO/orbsvcs/IFR_Service/ValueDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ValueDef_i.cpp
@@ -20,56 +20,56 @@ TAO_ValueDef_i::~TAO_ValueDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ValueDef_i::def_kind (CORBA::Environment &)
+TAO_ValueDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Value;
 }
 
-void 
-TAO_ValueDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ValueDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_ValueDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_ValueDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_ValueDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_ValueDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_ValueDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ValueDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-CORBA::TypeCode_ptr 
-TAO_ValueDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_ValueDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_ValueDef_i::type_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA::TypeCode_ptr
+TAO_ValueDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -77,39 +77,39 @@ TAO_ValueDef_i::type_i (CORBA::Environment & /* ACE_TRY_ENV */)
 }
 
 CORBA_InterfaceDefSeq *
-TAO_ValueDef_i::supported_interfaces (CORBA::Environment &ACE_TRY_ENV)
+TAO_ValueDef_i::supported_interfaces (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->supported_interfaces_i (ACE_TRY_ENV);
+  return this->supported_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_InterfaceDefSeq *
-TAO_ValueDef_i::supported_interfaces_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ValueDef_i::supported_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-void 
+void
 TAO_ValueDef_i::supported_interfaces (
-    const CORBA_InterfaceDefSeq &supported_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq &supported_interfaces
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->supported_interfaces_i (supported_interfaces,
-                                ACE_TRY_ENV);
+  this->supported_interfaces_i (supported_interfaces
+                                TAO_ENV_ARG_PARAMETER);
 }
 
-void 
+void
 TAO_ValueDef_i::supported_interfaces_i (
-    const CORBA_InterfaceDefSeq & /* supported_interfaces */,
-    CORBA::Environment & /* ACE_TRY_ENV */
+    const CORBA_InterfaceDefSeq & /* supported_interfaces */
+    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -117,239 +117,239 @@ TAO_ValueDef_i::supported_interfaces_i (
 }
 
 CORBA_InitializerSeq *
-TAO_ValueDef_i::initializers (CORBA::Environment &ACE_TRY_ENV)
+TAO_ValueDef_i::initializers (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->initializers_i (ACE_TRY_ENV);
+  return this->initializers_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_InitializerSeq *
-TAO_ValueDef_i::initializers_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ValueDef_i::initializers_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-void 
-TAO_ValueDef_i::initializers (const CORBA_InitializerSeq &initializers,
-                              CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ValueDef_i::initializers (const CORBA_InitializerSeq &initializers
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->initializers_i (initializers,
-                        ACE_TRY_ENV);
+  this->initializers_i (initializers
+                        TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_ValueDef_i::initializers_i (const CORBA_InitializerSeq & /* initializers */,
-                                CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_ValueDef_i::initializers_i (const CORBA_InitializerSeq & /* initializers */
+                                TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
-CORBA_ValueDef_ptr 
-TAO_ValueDef_i::base_value (CORBA::Environment &ACE_TRY_ENV)
+CORBA_ValueDef_ptr
+TAO_ValueDef_i::base_value (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_ValueDef::_nil ());
 
-  return this->base_value_i (ACE_TRY_ENV);
+  return this->base_value_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_ValueDef_ptr 
-TAO_ValueDef_i::base_value_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA_ValueDef_ptr
+TAO_ValueDef_i::base_value_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-void 
-TAO_ValueDef_i::base_value (CORBA_ValueDef_ptr base_value,
-                            CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ValueDef_i::base_value (CORBA_ValueDef_ptr base_value
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->base_value_i (base_value,
-                      ACE_TRY_ENV);
+  this->base_value_i (base_value
+                      TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_ValueDef_i::base_value_i (CORBA_ValueDef_ptr /* base_value */,
-                              CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_ValueDef_i::base_value_i (CORBA_ValueDef_ptr /* base_value */
+                              TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_ValueDefSeq *
-TAO_ValueDef_i::abstract_base_values (CORBA::Environment &ACE_TRY_ENV)
+TAO_ValueDef_i::abstract_base_values (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->abstract_base_values_i (ACE_TRY_ENV);
+  return this->abstract_base_values_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_ValueDefSeq *
-TAO_ValueDef_i::abstract_base_values_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ValueDef_i::abstract_base_values_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-void 
+void
 TAO_ValueDef_i::abstract_base_values (
-    const CORBA_ValueDefSeq &abstract_base_values,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ValueDefSeq &abstract_base_values
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
-  
-  this->abstract_base_values_i (abstract_base_values,
-                                ACE_TRY_ENV);
+
+  this->abstract_base_values_i (abstract_base_values
+                                TAO_ENV_ARG_PARAMETER);
 }
 
-void 
+void
 TAO_ValueDef_i::abstract_base_values_i (
-    const CORBA_ValueDefSeq & /* abstract_base_values */,
-    CORBA::Environment & /* ACE_TRY_ENV */
+    const CORBA_ValueDefSeq & /* abstract_base_values */
+    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
-CORBA::Boolean 
-TAO_ValueDef_i::is_abstract (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_ValueDef_i::is_abstract (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->is_abstract_i (ACE_TRY_ENV);
+  return this->is_abstract_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::Boolean 
-TAO_ValueDef_i::is_abstract_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA::Boolean
+TAO_ValueDef_i::is_abstract_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-void 
-TAO_ValueDef_i::is_abstract (CORBA::Boolean is_abstract,
-                             CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ValueDef_i::is_abstract (CORBA::Boolean is_abstract
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->is_abstract (is_abstract,
-                     ACE_TRY_ENV);
+  this->is_abstract (is_abstract
+                     TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_ValueDef_i::is_abstract_i (CORBA::Boolean /* is_abstract */,
-                             CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_ValueDef_i::is_abstract_i (CORBA::Boolean /* is_abstract */
+                             TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
-CORBA::Boolean 
-TAO_ValueDef_i::is_custom (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_ValueDef_i::is_custom (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->is_custom_i (ACE_TRY_ENV);
+  return this->is_custom_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::Boolean 
-TAO_ValueDef_i::is_custom_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA::Boolean
+TAO_ValueDef_i::is_custom_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-void 
-TAO_ValueDef_i::is_custom (CORBA::Boolean is_custom,
-                           CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ValueDef_i::is_custom (CORBA::Boolean is_custom
+                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->is_custom_i (is_custom,
-                     ACE_TRY_ENV);
+  this->is_custom_i (is_custom
+                     TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_ValueDef_i::is_custom_i (CORBA::Boolean /* is_custom */,
-                             CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_ValueDef_i::is_custom_i (CORBA::Boolean /* is_custom */
+                             TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
-CORBA::Boolean 
-TAO_ValueDef_i::is_truncatable (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_ValueDef_i::is_truncatable (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->is_truncatable_i (ACE_TRY_ENV);
+  return this->is_truncatable_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::Boolean 
-TAO_ValueDef_i::is_truncatable_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA::Boolean
+TAO_ValueDef_i::is_truncatable_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-void 
-TAO_ValueDef_i::is_truncatable (CORBA::Boolean is_truncatable,
-                                CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ValueDef_i::is_truncatable (CORBA::Boolean is_truncatable
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->is_truncatable_i (is_truncatable,
-                          ACE_TRY_ENV);
+  this->is_truncatable_i (is_truncatable
+                          TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_ValueDef_i::is_truncatable_i (CORBA::Boolean /* is_truncatable */,
-                                  CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_ValueDef_i::is_truncatable_i (CORBA::Boolean /* is_truncatable */
+                                  TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
-CORBA::Boolean 
-TAO_ValueDef_i::is_a (const char *id,
-                      CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_ValueDef_i::is_a (const char *id
+                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->is_a_i (id,
-                       ACE_TRY_ENV);
+  return this->is_a_i (id
+                       TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA::Boolean 
-TAO_ValueDef_i::is_a_i (const char *id,
-                        CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA::Boolean
+TAO_ValueDef_i::is_a_i (const char *id
+                        TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (id, "IDL:omg.org/CORBA/ValueBase:1.0") == 0)
@@ -362,29 +362,29 @@ TAO_ValueDef_i::is_a_i (const char *id,
 }
 
 CORBA_ValueDef::FullValueDescription *
-TAO_ValueDef_i::describe_value (CORBA::Environment &ACE_TRY_ENV)
+TAO_ValueDef_i::describe_value (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_value_i (ACE_TRY_ENV);
-}    
+  return this->describe_value_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+}
 
 CORBA_ValueDef::FullValueDescription *
-TAO_ValueDef_i::describe_value_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ValueDef_i::describe_value_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
-}     
+}
 
-CORBA_ValueMemberDef_ptr 
+CORBA_ValueMemberDef_ptr
 TAO_ValueDef_i::create_value_member (const char *id,
                                      const char *name,
                                      const char *version,
                                      CORBA_IDLType_ptr type,
-                                     CORBA::Visibility access,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     CORBA::Visibility access
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_ValueMemberDef::_nil ());
@@ -393,31 +393,31 @@ TAO_ValueDef_i::create_value_member (const char *id,
                                       name,
                                       version,
                                       type,
-                                      access,
-                                      ACE_TRY_ENV);
+                                      access
+                                      TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA_ValueMemberDef_ptr 
+CORBA_ValueMemberDef_ptr
 TAO_ValueDef_i::create_value_member_i (const char * /* id */,
                                        const char * /* name */,
                                        const char * /* version */,
                                        CORBA_IDLType_ptr /* type */,
-                                       CORBA::Visibility /* access */,
-                                       CORBA::Environment & /* ACE_TRY_ENV */)
+                                       CORBA::Visibility /* access */
+                                       TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-CORBA_AttributeDef_ptr 
+CORBA_AttributeDef_ptr
 TAO_ValueDef_i::create_attribute (
     const char *id,
     const char *name,
     const char *version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::AttributeMode mode
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -427,18 +427,18 @@ TAO_ValueDef_i::create_attribute (
                                    name,
                                    version,
                                    type,
-                                   mode,
-                                   ACE_TRY_ENV);
+                                   mode
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA_AttributeDef_ptr 
+CORBA_AttributeDef_ptr
 TAO_ValueDef_i::create_attribute_i (
     const char * /* id */,
     const char * /* name */,
     const char * /* version */,
     CORBA_IDLType_ptr /* type */,
-    CORBA::AttributeMode /* mode */,
-    CORBA::Environment & /* ACE_TRY_ENV */
+    CORBA::AttributeMode /* mode */
+    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -446,7 +446,7 @@ TAO_ValueDef_i::create_attribute_i (
   return 0;
 }
 
-CORBA_OperationDef_ptr 
+CORBA_OperationDef_ptr
 TAO_ValueDef_i::create_operation (
     const char *id,
     const char *name,
@@ -455,8 +455,8 @@ TAO_ValueDef_i::create_operation (
     CORBA::OperationMode mode,
     const CORBA_ParDescriptionSeq &params,
     const CORBA_ExceptionDefSeq &exceptions,
-    const CORBA_ContextIdSeq &contexts,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ContextIdSeq &contexts
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -469,11 +469,11 @@ TAO_ValueDef_i::create_operation (
                                    mode,
                                    params,
                                    exceptions,
-                                   contexts,
-                                   ACE_TRY_ENV);
+                                   contexts
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA_OperationDef_ptr 
+CORBA_OperationDef_ptr
 TAO_ValueDef_i::create_operation_i (
     const char * /* id */,
     const char * /* name */,
@@ -482,8 +482,8 @@ TAO_ValueDef_i::create_operation_i (
     CORBA::OperationMode /* mode */,
     const CORBA_ParDescriptionSeq & /* params */,
     const CORBA_ExceptionDefSeq & /* exceptions */,
-    const CORBA_ContextIdSeq & /* contexts */,
-    CORBA::Environment & /* ACE_TRY_ENV */
+    const CORBA_ContextIdSeq & /* contexts */
+    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
diff --git a/TAO/orbsvcs/IFR_Service/ValueDef_i.h b/TAO/orbsvcs/IFR_Service/ValueDef_i.h
index f0d79461aba..4bd20588fd8 100644
--- a/TAO/orbsvcs/IFR_Service/ValueDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/ValueDef_i.h
@@ -34,8 +34,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_ValueDef_i : public virtual TAO_Container_i, 
-                       public virtual TAO_Contained_i, 
+class TAO_ValueDef_i : public virtual TAO_Container_i,
+                       public virtual TAO_Contained_i,
                        public virtual TAO_IDLType_i
 {
   // = TITLE
@@ -53,270 +53,230 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA_InterfaceDefSeq *supported_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_InterfaceDefSeq *supported_interfaces_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void supported_interfaces (
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & supported_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void supported_interfaces_i (
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & supported_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_InitializerSeq *initializers (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_InitializerSeq *initializers_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void initializers (
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void initializers_i (
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ValueDef_ptr base_value (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ValueDef_ptr base_value_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void base_value (
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_ValueDef_ptr base_value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void base_value_i (
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_ValueDef_ptr base_value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ValueDefSeq *abstract_base_values (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ValueDefSeq *abstract_base_values_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void abstract_base_values (
-      const CORBA_ValueDefSeq & abstract_base_values,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ValueDefSeq & abstract_base_values
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void abstract_base_values_i (
-      const CORBA_ValueDefSeq & abstract_base_values,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ValueDefSeq & abstract_base_values
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_abstract (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_abstract_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void is_abstract (
-      CORBA::Boolean is_abstract,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean is_abstract
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void is_abstract_i (
-      CORBA::Boolean is_abstract,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean is_abstract
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_custom (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_custom_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void is_custom (
-      CORBA::Boolean is_custom,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean is_custom
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void is_custom_i (
-      CORBA::Boolean is_custom,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean is_custom
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_truncatable (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_truncatable_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void is_truncatable (
-      CORBA::Boolean is_truncatable,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean is_truncatable
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void is_truncatable_i (
-      CORBA::Boolean is_truncatable,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean is_truncatable
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_a (
-      const char *id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
-      const char *id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ValueDef::FullValueDescription *describe_value (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));      
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ValueDef::FullValueDescription *describe_value_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));      
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ValueMemberDef_ptr create_value_member (
       const char *id,
       const char *name,
       const char *version,
       CORBA_IDLType_ptr type,
-      CORBA::Visibility access,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Visibility access
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ValueMemberDef_ptr create_value_member_i (
@@ -324,10 +284,9 @@ public:
       const char *name,
       const char *version,
       CORBA_IDLType_ptr type,
-      CORBA::Visibility access,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Visibility access
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_AttributeDef_ptr create_attribute (
@@ -335,10 +294,9 @@ public:
       const char *name,
       const char *version,
       CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_AttributeDef_ptr create_attribute_i (
@@ -346,10 +304,9 @@ public:
       const char *name,
       const char *version,
       CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_OperationDef_ptr create_operation (
@@ -360,10 +317,9 @@ public:
       CORBA::OperationMode mode,
       const CORBA_ParDescriptionSeq &params,
       const CORBA_ExceptionDefSeq &exceptions,
-      const CORBA_ContextIdSeq &contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ContextIdSeq &contexts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_OperationDef_ptr create_operation_i (
@@ -374,10 +330,9 @@ public:
       CORBA::OperationMode mode,
       const CORBA_ParDescriptionSeq &params,
       const CORBA_ExceptionDefSeq &exceptions,
-      const CORBA_ContextIdSeq &contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ContextIdSeq &contexts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.cpp b/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.cpp
index aa8bb89e0e5..e99f4fcd66e 100644
--- a/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.cpp
@@ -20,129 +20,129 @@ TAO_ValueMemberDef_i::~TAO_ValueMemberDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ValueMemberDef_i::def_kind (CORBA::Environment &)
+TAO_ValueMemberDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_ValueMember;
 }
 
-void 
-TAO_ValueMemberDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ValueMemberDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_ValueMemberDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_ValueMemberDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_ValueMemberDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_ValueMemberDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_ValueMemberDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ValueMemberDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-CORBA::TypeCode_ptr 
-TAO_ValueMemberDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_ValueMemberDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_ValueMemberDef_i::type_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA::TypeCode_ptr
+TAO_ValueMemberDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-CORBA_IDLType_ptr 
-TAO_ValueMemberDef_i::type_def (CORBA::Environment &ACE_TRY_ENV)
+CORBA_IDLType_ptr
+TAO_ValueMemberDef_i::type_def (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ());
 
-  return this->type_def_i (ACE_TRY_ENV);
+  return this->type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_IDLType_ptr 
-TAO_ValueMemberDef_i::type_def_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA_IDLType_ptr
+TAO_ValueMemberDef_i::type_def_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-void 
-TAO_ValueMemberDef_i::type_def (CORBA_IDLType_ptr type_def,
-                                CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ValueMemberDef_i::type_def (CORBA_IDLType_ptr type_def
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->type_def_i (type_def,
-                    ACE_TRY_ENV);
+  this->type_def_i (type_def
+                    TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_ValueMemberDef_i::type_def_i (CORBA_IDLType_ptr /* type_def */,
-                                  CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_ValueMemberDef_i::type_def_i (CORBA_IDLType_ptr /* type_def */
+                                  TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
-CORBA::Visibility 
-TAO_ValueMemberDef_i::access (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Visibility
+TAO_ValueMemberDef_i::access (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->access_i (ACE_TRY_ENV);
+  return this->access_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::Visibility 
-TAO_ValueMemberDef_i::access_i (CORBA::Environment & /* ACE_TRY_ENV */ )
+CORBA::Visibility
+TAO_ValueMemberDef_i::access_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-void 
-TAO_ValueMemberDef_i::access (CORBA::Visibility access,
-                              CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ValueMemberDef_i::access (CORBA::Visibility access
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->access (access,
-                ACE_TRY_ENV);
+  this->access (access
+                TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_ValueMemberDef_i::access_i (CORBA::Visibility /* access */,
-                                CORBA::Environment & /* ACE_TRY_ENV */ )
+void
+TAO_ValueMemberDef_i::access_i (CORBA::Visibility /* access */
+                                TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.h b/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.h
index 59e35bc2aa7..3fdd11ea192 100644
--- a/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.h
@@ -50,101 +50,86 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_IDLType_ptr type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_IDLType_ptr type_def_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void type_def (
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void type_def_i (
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Visibility access (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Visibility access_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void access (
-      CORBA::Visibility access,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Visibility access
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void access_i (
-      CORBA::Visibility access,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Visibility access
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/WstringDef_i.cpp b/TAO/orbsvcs/IFR_Service/WstringDef_i.cpp
index 58ed597e2ec..96e5401bc90 100644
--- a/TAO/orbsvcs/IFR_Service/WstringDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/WstringDef_i.cpp
@@ -20,23 +20,23 @@ TAO_WstringDef_i::~TAO_WstringDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_WstringDef_i::def_kind (CORBA::Environment &)
+TAO_WstringDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Wstring;
 }
 
-void 
-TAO_WstringDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_WstringDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_WstringDef_i::destroy_i (CORBA::Environment &)
+void
+TAO_WstringDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString name;
@@ -49,37 +49,37 @@ TAO_WstringDef_i::destroy_i (CORBA::Environment &)
                                           0);
 }
 
-CORBA::TypeCode_ptr 
-TAO_WstringDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_WstringDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_WstringDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_WstringDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::ULong bound = this->bound_i (ACE_TRY_ENV);
+  CORBA::ULong bound = this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->repo_->tc_factory ()->create_wstring_tc (bound,
-                                                        ACE_TRY_ENV);
+  return this->repo_->tc_factory ()->create_wstring_tc (bound
+                                                        TAO_ENV_ARG_PARAMETER);
 }
-CORBA::ULong 
-TAO_WstringDef_i::bound (CORBA::Environment &ACE_TRY_ENV)
+CORBA::ULong
+TAO_WstringDef_i::bound (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->bound_i (ACE_TRY_ENV);
+  return this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 
-CORBA::ULong 
-TAO_WstringDef_i::bound_i (CORBA::Environment &)
+CORBA::ULong
+TAO_WstringDef_i::bound_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int retval = 0;
@@ -90,20 +90,20 @@ TAO_WstringDef_i::bound_i (CORBA::Environment &)
   return ACE_static_cast (CORBA::ULong, retval);
 }
 
-void 
-TAO_WstringDef_i::bound (CORBA::ULong bound,
-                         CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_WstringDef_i::bound (CORBA::ULong bound
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->bound_i (bound,
-                 ACE_TRY_ENV);
+  this->bound_i (bound
+                 TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_WstringDef_i::bound_i (CORBA::ULong bound,
-                           CORBA::Environment &)
+void
+TAO_WstringDef_i::bound_i (CORBA::ULong bound
+                           TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
diff --git a/TAO/orbsvcs/IFR_Service/WstringDef_i.h b/TAO/orbsvcs/IFR_Service/WstringDef_i.h
index ff243a9ccdb..80c3387cfb0 100644
--- a/TAO/orbsvcs/IFR_Service/WstringDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/WstringDef_i.h
@@ -51,63 +51,54 @@ public:
   // Destructor.
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's virtual function.
 
   virtual CORBA::ULong bound (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ULong bound_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void bound (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void bound_i (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/be_produce.cpp b/TAO/orbsvcs/IFR_Service/be_produce.cpp
index 299d407c046..4733035164f 100644
--- a/TAO/orbsvcs/IFR_Service/be_produce.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_produce.cpp
@@ -65,7 +65,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
  */
 
 // BE_produce.cc - Produce the work of the BE - does nothing in the
-//		   dummy BE
+//                 dummy BE
 
 #include "idl.h"
 #include "idl_extern.h"
@@ -93,22 +93,22 @@ BE_cleanup (void)
   idl_global = 0;
 
   // Remove the holding scope entry from the repository.
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA_Contained_var result =
-        be_global->repository ()->lookup_id (be_global->holding_scope_name (),
-                                             ACE_TRY_ENV);
+        be_global->repository ()->lookup_id (be_global->holding_scope_name ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!CORBA::is_nil (result.in ()))
         {
           CORBA_ModuleDef_var scope =
-            CORBA_ModuleDef::_narrow (result.in (),
-                                      ACE_TRY_ENV);
+            CORBA_ModuleDef::_narrow (result.in ()
+                                      TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          scope->destroy (ACE_TRY_ENV);
+          scope->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -140,18 +140,18 @@ TAO_IFR_BE_Export int
 BE_ifr_init (int &ac,
              char *av[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       be_global->orb (CORBA::ORB_init (ac,
                                        av,
-                                       0,
-                                       ACE_TRY_ENV));
+                                       0
+                                       TAO_ENV_ARG_PARAMETER));
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        be_global->orb ()->resolve_initial_references ("InterfaceRepository",
-                                                       ACE_TRY_ENV);
+        be_global->orb ()->resolve_initial_references ("InterfaceRepository"
+                                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (object.in ()))
@@ -164,8 +164,8 @@ BE_ifr_init (int &ac,
           );
         }
 
-      CORBA_Repository_var repo = CORBA_Repository::_narrow (object.in (),
-                                                             ACE_TRY_ENV);
+      CORBA_Repository_var repo = CORBA_Repository::_narrow (object.in ()
+                                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (repo.in ()))
@@ -191,16 +191,16 @@ BE_ifr_init (int &ac,
 
   return 0;
 }
- 
+
 void
-BE_create_holding_scope (CORBA::Environment &ACE_TRY_ENV)
+BE_create_holding_scope (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA_ModuleDef_ptr scope = CORBA_ModuleDef::_nil ();
 
   // If we are multi-threaded, it may already be created.
   CORBA_Contained_var result =
-    be_global->repository ()->lookup_id (be_global->holding_scope_name (),
-                                         ACE_TRY_ENV);
+    be_global->repository ()->lookup_id (be_global->holding_scope_name ()
+                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (result.in ()))
@@ -209,15 +209,15 @@ BE_create_holding_scope (CORBA::Environment &ACE_TRY_ENV)
         be_global->repository ()->create_module (
                                       be_global->holding_scope_name (),
                                       be_global->holding_scope_name (),
-                                      "1.0",
-                                      ACE_TRY_ENV
+                                      "1.0"
+                                      TAO_ENV_ARG_PARAMETER
                                     );
       ACE_CHECK;
     }
   else
     {
-      scope = CORBA_ModuleDef::_narrow (result.in (),
-                                        ACE_TRY_ENV);
+      scope = CORBA_ModuleDef::_narrow (result.in ()
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -228,10 +228,10 @@ BE_create_holding_scope (CORBA::Environment &ACE_TRY_ENV)
 TAO_IFR_BE_Export void
 BE_produce (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      BE_create_holding_scope (ACE_TRY_ENV);
+      BE_create_holding_scope (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the root node.
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.h.diff
index 532b5c0956c..ef31bb029eb 100644
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.h.diff
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.h.diff
@@ -44,7 +44,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -175,6 +171,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -77,7 +77,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -523,6 +521,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -110,7 +110,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -1109,6 +1109,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -143,7 +143,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -1481,6 +1483,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -176,7 +176,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -1737,6 +1741,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.h.diff
index 7ef393f6660..ce3c642d39b 100644
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.h.diff
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.h.diff
@@ -45,7 +45,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -435,6 +431,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -78,7 +78,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -886,6 +884,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -111,7 +111,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -1209,6 +1209,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -144,7 +144,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -1668,6 +1670,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -177,7 +177,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -2152,6 +2156,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -210,7 +210,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -2476,6 +2482,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -243,7 +243,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -2774,6 +2782,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -276,7 +276,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -3039,6 +3049,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -309,7 +309,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -3215,6 +3227,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -342,7 +342,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -3416,6 +3430,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -375,7 +375,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -3626,6 +3642,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -408,7 +408,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -3885,6 +3903,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -441,7 +441,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -4169,6 +4189,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -474,7 +474,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -4636,6 +4658,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -507,7 +507,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -4984,6 +5008,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -540,7 +540,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -5447,6 +5473,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -573,7 +573,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -6035,6 +6063,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -606,7 +606,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -6532,6 +6562,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -639,7 +639,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -6964,6 +6996,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.h.diff
index 0183dd4a15d..2a03ee5d895 100644
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.h.diff
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.h.diff
@@ -33,7 +33,7 @@
      // as soon as their use is necessary.
      void create_proxy (
 @@ -400,6 +401,8 @@
-       CORBA::Environment &ACE_TRY_ENV
+       TAO_ENV_SINGLE_ARG_DECL
      );
      
 +  private:
@@ -61,7 +61,7 @@
      // as soon as their use is necessary.
      void create_proxy (
 @@ -683,6 +687,8 @@
-       CORBA::Environment &ACE_TRY_ENV
+       TAO_ENV_SINGLE_ARG_DECL
      );
      
 +private:
@@ -89,7 +89,7 @@
      // as soon as their use is necessary.
      void create_proxy (
 @@ -963,6 +970,8 @@
-       CORBA::Environment &ACE_TRY_ENV
+       TAO_ENV_SINGLE_ARG_DECL
      );
      
 +private:
@@ -117,7 +117,7 @@
      // as soon as their use is necessary.
      void create_proxy (
 @@ -1252,6 +1262,8 @@
-       CORBA::Environment &ACE_TRY_ENV
+       TAO_ENV_SINGLE_ARG_DECL
      );
      
 +private:
@@ -145,7 +145,7 @@
      // as soon as their use is necessary.
      void create_proxy (
 @@ -1525,6 +1538,8 @@
-       CORBA::Environment &ACE_TRY_ENV
+       TAO_ENV_SINGLE_ARG_DECL
      );
      
 +private:
@@ -173,7 +173,7 @@
      // as soon as their use is necessary.
      void create_proxy (
 @@ -1781,6 +1797,8 @@
-       CORBA::Environment &ACE_TRY_ENV
+       TAO_ENV_SINGLE_ARG_DECL
      );
      
 +private:
@@ -201,7 +201,7 @@
      // as soon as their use is necessary.
      void create_proxy (
 @@ -2037,6 +2056,8 @@
-       CORBA::Environment &ACE_TRY_ENV
+       TAO_ENV_SINGLE_ARG_DECL
      );
      
 +private:
@@ -229,7 +229,7 @@
      // as soon as their use is necessary.
      void create_proxy (
 @@ -2715,6 +2737,8 @@
-       CORBA::Environment &ACE_TRY_ENV
+       TAO_ENV_SINGLE_ARG_DECL
      );
      
 +private:
@@ -257,7 +257,7 @@
      // as soon as their use is necessary.
      void create_proxy (
 @@ -3122,6 +3147,8 @@
-       CORBA::Environment &ACE_TRY_ENV
+       TAO_ENV_SINGLE_ARG_DECL
      );
      
 +private:
@@ -285,7 +285,7 @@
      // as soon as their use is necessary.
      void create_proxy (
 @@ -3467,6 +3495,8 @@
-       CORBA::Environment &ACE_TRY_ENV
+       TAO_ENV_SINGLE_ARG_DECL
      );
      
 +private:
@@ -313,7 +313,7 @@
      // as soon as their use is necessary.
      void create_proxy (
 @@ -3795,6 +3826,8 @@
-       CORBA::Environment &ACE_TRY_ENV
+       TAO_ENV_SINGLE_ARG_DECL
      );
      
 +private:
@@ -341,7 +341,7 @@
      // as soon as their use is necessary.
      void create_proxy (
 @@ -4385,6 +4419,8 @@
-       CORBA::Environment &ACE_TRY_ENV
+       TAO_ENV_SINGLE_ARG_DECL
      );
      
 +private:
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.h.diff
index c2d07095b4a..fcec20c57a1 100644
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.h.diff
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.h.diff
@@ -45,7 +45,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -234,6 +230,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -78,7 +78,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -590,6 +588,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -111,7 +111,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -1346,6 +1346,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -144,7 +144,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -1807,6 +1809,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
index 90bc1795824..3b7f1e6b876 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
@@ -18,7 +18,7 @@ ifr_adding_visitor::~ifr_adding_visitor (void)
 {
 }
 
-int 
+int
 ifr_adding_visitor::visit_scope (UTL_Scope *node)
 {
   // Proceed if the number of members in our scope is greater than 0.
@@ -41,7 +41,7 @@ ifr_adding_visitor::visit_scope (UTL_Scope *node)
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_scope -")
                   ACE_TEXT (" bad node in this scope\n")
-                ), 
+                ),
                 -1
               );
             }
@@ -60,7 +60,7 @@ ifr_adding_visitor::visit_scope (UTL_Scope *node)
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_scope -")
                   ACE_TEXT (" failed to accept visitor\n")
-                ),  
+                ),
                 -1
               );
             }
@@ -72,16 +72,16 @@ ifr_adding_visitor::visit_scope (UTL_Scope *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_predefined_type (AST_PredefinedType *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
-    {  
-      this->ir_current_ = 
+    {
+      this->ir_current_ =
       be_global->repository ()->get_primitive (
-                                    this->predefined_type_to_pkind (node),
-                                    ACE_TRY_ENV
+                                    this->predefined_type_to_pkind (node)
+                                    TAO_ENV_ARG_PARAMETER
                                   );
       ACE_TRY_CHECK;
     }
@@ -89,7 +89,7 @@ ifr_adding_visitor::visit_predefined_type (AST_PredefinedType *node)
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                            ACE_TEXT ("visit_predefined_type"));
-    
+
       return -1;
     }
   ACE_ENDTRY;
@@ -97,7 +97,7 @@ ifr_adding_visitor::visit_predefined_type (AST_PredefinedType *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_module (AST_Module *node)
 {
   if (node->imported () && !be_global->do_included_files ())
@@ -107,14 +107,14 @@ ifr_adding_visitor::visit_module (AST_Module *node)
 
   CORBA_Container_var new_def;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // If this module been opened before, it will already be in
       // the repository.
-      CORBA_Contained_var prev_def = 
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+      CORBA_Contained_var prev_def =
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (prev_def.in ()))
@@ -127,8 +127,8 @@ ifr_adding_visitor::visit_module (AST_Module *node)
               new_def = container->create_module (
                                        node->repoID (),
                                        node->local_name ()->get_string (),
-                                       this->gen_version (node),
-                                       ACE_TRY_ENV
+                                       this->gen_version (node)
+                                       TAO_ENV_ARG_PARAMETER
                                      );
               ACE_TRY_CHECK;
             }
@@ -138,14 +138,14 @@ ifr_adding_visitor::visit_module (AST_Module *node)
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_module -")
                   ACE_TEXT (" scope stack is empty\n")
-                ),  
+                ),
                 -1
               );
             }
         }
       else
         {
-          CORBA::DefinitionKind kind = prev_def->def_kind (ACE_TRY_ENV);
+          CORBA::DefinitionKind kind = prev_def->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // If the line below is true, we are clobbering a previous
@@ -154,7 +154,7 @@ ifr_adding_visitor::visit_module (AST_Module *node)
           // original entry, create the new one, and let the user beware.
           if (kind != CORBA::dk_Module)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the brach where prev_def.in() is 0.
@@ -163,8 +163,8 @@ ifr_adding_visitor::visit_module (AST_Module *node)
           else
             {
               new_def =
-                CORBA_Container::_narrow (prev_def.in (),
-                                          ACE_TRY_ENV);
+                CORBA_Container::_narrow (prev_def.in ()
+                                          TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -175,7 +175,7 @@ ifr_adding_visitor::visit_module (AST_Module *node)
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_module -")
               ACE_TEXT (" scope push failed\n")
-            ),  
+            ),
             -1
           );
         }
@@ -186,7 +186,7 @@ ifr_adding_visitor::visit_module (AST_Module *node)
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_module -")
               ACE_TEXT (" visit_scope failed\n")
-            ),  
+            ),
             -1
           );
         }
@@ -199,7 +199,7 @@ ifr_adding_visitor::visit_module (AST_Module *node)
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_module -")
               ACE_TEXT (" scope pop failed\n")
-            ),  
+            ),
             -1
           );
         }
@@ -216,7 +216,7 @@ ifr_adding_visitor::visit_module (AST_Module *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_interface (AST_Interface *node)
 {
   if (node->imported () && !be_global->do_included_files ())
@@ -230,20 +230,20 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
       return this->visit_valuetype (node);
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Is this interface already in the respository?
       CORBA_Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
         {
-          int status = this->create_interface_def (node,
-                                                   ACE_TRY_ENV);
+          int status = this->create_interface_def (node
+                                                   TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           return status;
@@ -251,9 +251,9 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
       else
         {
           // There is already an entry in the repository. If the interface is
-          // defined and has not already been populated, we do so 
+          // defined and has not already been populated, we do so
           // now. If it is not yet defined or the full definition has already
-          // been added to the repository, we just update the current IR object 
+          // been added to the repository, we just update the current IR object
           // holder.
           if (node->is_defined () && node->ifr_added () == 0)
             {
@@ -268,17 +268,17 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
               // previous IFR entry, then create a new one.
               if (node->ifr_fwd_added () == 0)
                 {
-                  prev_def->destroy (ACE_TRY_ENV);
+                  prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
-                  int status = this->create_interface_def (node,
-                                                           ACE_TRY_ENV);
+                  int status = this->create_interface_def (node
+                                                           TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   return status;
                 }
 
-              CORBA::ULong n_parents = ACE_static_cast (CORBA::ULong, 
+              CORBA::ULong n_parents = ACE_static_cast (CORBA::ULong,
                                                         node->n_inherits ());
 
               CORBA_InterfaceDefSeq bases (n_parents);
@@ -290,28 +290,28 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
               // Construct a list of the parents.
               for (CORBA::ULong i = 0; i < n_parents; ++i)
                 {
-                  result = 
-                    be_global->repository ()->lookup_id (parents[i]->repoID (),
-                                                         ACE_TRY_ENV);
+                  result =
+                    be_global->repository ()->lookup_id (parents[i]->repoID ()
+                                                         TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   // If one of our interface's parents is not in the repository,
                   // that means that it has not yet been seen (even as a
                   // forward declaration) in the IDL file, and we will have to
-                  // postpone the populating of our interface until they are all 
+                  // postpone the populating of our interface until they are all
                   // added.
                   if (CORBA::is_nil (result.in ()))
                     {
                       this->ir_current_ =
-                        CORBA_IDLType::_narrow (prev_def.in (),
-                                                ACE_TRY_ENV);
+                        CORBA_IDLType::_narrow (prev_def.in ()
+                                                TAO_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK
 
                       return 0;
                     }
 
-                  bases[i] = CORBA_InterfaceDef::_narrow (result.in (),
-                                                          ACE_TRY_ENV);
+                  bases[i] = CORBA_InterfaceDef::_narrow (result.in ()
+                                                          TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   if (CORBA::is_nil (bases[i].in ()))
@@ -321,19 +321,19 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
                           ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                           ACE_TEXT ("visit_interface -")
                           ACE_TEXT (" CORBA_InterfaceDef::_narrow failed\n")
-                        ),  
+                        ),
                         -1
                       );
                     }
                 }
 
               CORBA_InterfaceDef_var extant_def =
-                CORBA_InterfaceDef::_narrow (prev_def. in (),
-                                             ACE_TRY_ENV);
+                CORBA_InterfaceDef::_narrow (prev_def. in ()
+                                             TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
-              extant_def->base_interfaces (bases,
-                                           ACE_TRY_ENV);
+              extant_def->base_interfaces (bases
+                                           TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK
 
               node->ifr_added (1);
@@ -346,7 +346,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
                       ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                       ACE_TEXT ("visit_interface -")
                       ACE_TEXT (" scope push failed\n")
-                    ),  
+                    ),
                     -1
                   );
                 }
@@ -359,7 +359,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
                       ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                       ACE_TEXT ("visit_interface -")
                       ACE_TEXT (" visit_scope failed\n")
-                    ),  
+                    ),
                     -1
                   );
                 }
@@ -369,7 +369,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
               // The front end will already have fully defined it, so all
               // the info is available anywhere. So it's a good idea to
               // update the current IR object holder now.
-              this->ir_current_ = 
+              this->ir_current_ =
                 CORBA_IDLType::_duplicate (extant_def.in ());
 
               CORBA_Container_ptr used_scope = CORBA_Container::_nil ();
@@ -382,7 +382,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
                       ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                       ACE_TEXT ("visit_interface -")
                       ACE_TEXT (" scope pop failed\n")
-                    ),  
+                    ),
                     -1
                   );
                 }
@@ -395,8 +395,8 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
               // not defined/added - not possible.
               // defined/not added - takes the other branch.
               // defined/added - we're ok.
-              this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in (),
-                                                          ACE_TRY_ENV);
+              this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in ()
+                                                          TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -413,7 +413,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
 {
   if (node->imported () && !be_global->do_included_files ())
@@ -423,13 +423,13 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
 
   AST_Interface *i = node->full_definition ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Is this interface already in the respository?
       CORBA_Contained_var prev_def =
-        be_global->repository ()->lookup_id (i->repoID (),
-                                             ACE_TRY_ENV);
+        be_global->repository ()->lookup_id (i->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (prev_def.in ()))
@@ -443,7 +443,7 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
           bases.length (0);
 
           CORBA_Container_ptr current_scope = CORBA_Container::_nil ();
-  
+
           if (be_global->ifr_scopes ().top (current_scope) == 0)
             {
               if (i->is_local ())
@@ -453,8 +453,8 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
                                        i->repoID (),
                                        i->local_name ()->get_string (),
                                        this->gen_version (i),
-                                       bases,
-                                       ACE_TRY_ENV
+                                       bases
+                                       TAO_ENV_ARG_PARAMETER
                                      );
                 }
               else
@@ -464,8 +464,8 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
                                        i->repoID (),
                                        i->local_name ()->get_string (),
                                        this->gen_version (i),
-                                       bases,
-                                       ACE_TRY_ENV
+                                       bases
+                                       TAO_ENV_ARG_PARAMETER
                                      );
                 }
 
@@ -478,7 +478,7 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                   ACE_TEXT ("visit_interface_fwd -")
                   ACE_TEXT (" scope stack is empty\n")
-                ),  
+                ),
                 -1
               );
             }
@@ -493,7 +493,7 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch of
@@ -503,8 +503,8 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
 
           // There is already an entry in the repository, so just update
           // the current IR object holder.
-          this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in (),
-                                                      ACE_TRY_ENV);
+          this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -522,19 +522,19 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_valuetype (AST_Interface *)
 {
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_valuetype_fwd (AST_InterfaceFwd *)
 {
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_structure (AST_Structure *node)
 {
   if (node->imported () && !be_global->do_included_files ())
@@ -542,12 +542,12 @@ ifr_adding_visitor::visit_structure (AST_Structure *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      CORBA_Contained_var prev_def = 
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+      CORBA_Contained_var prev_def =
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (prev_def.in ()))
@@ -573,15 +573,15 @@ ifr_adding_visitor::visit_structure (AST_Structure *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               return this->visit_structure (node);
             }
 
           this->ir_current_ =
-            CORBA_IDLType::_narrow (prev_def.in (),
-                                    ACE_TRY_ENV);
+            CORBA_IDLType::_narrow (prev_def.in ()
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -597,7 +597,7 @@ ifr_adding_visitor::visit_structure (AST_Structure *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_exception (AST_Exception *node)
 {
   if (node->imported () && !be_global->do_included_files ())
@@ -613,7 +613,7 @@ ifr_adding_visitor::visit_exception (AST_Exception *node)
   return visitor.visit_exception (node);
 }
 
-int 
+int
 ifr_adding_visitor::visit_enum (AST_Enum *node)
 {
   if (node->imported () && !be_global->do_included_files ())
@@ -621,20 +621,20 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Is this enum already in the respository?
       CORBA_Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
         {
-          CORBA::ULong member_count = 
-            ACE_static_cast (CORBA::ULong, 
+          CORBA::ULong member_count =
+            ACE_static_cast (CORBA::ULong,
                              node->member_count ());
 
           CORBA_EnumMemberSeq members (member_count);
@@ -647,7 +647,7 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
             {
               member_name = node->value_to_name (i);
 
-              members[i] = 
+              members[i] =
                 CORBA::string_dup (
                     member_name->last_component ()->get_string ()
                   );
@@ -662,8 +662,8 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
                     node->repoID (),
                     node->local_name ()->get_string (),
                     this->gen_version (node),
-                    members,
-                    ACE_TRY_ENV
+                    members
+                    TAO_ENV_ARG_PARAMETER
                   );
               ACE_TRY_CHECK;
             }
@@ -673,7 +673,7 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_enum -")
                   ACE_TEXT (" scope stack is empty\n")
-                ),  
+                ),
                 -1
               );
             }
@@ -688,7 +688,7 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               return this->visit_enum (node);
@@ -696,9 +696,9 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
 
           // There is already an entry in the repository, so just update
           // the current IR object holder.
-          this->ir_current_ = 
-            CORBA_EnumDef::_narrow (prev_def.in (),
-                                    ACE_TRY_ENV);
+          this->ir_current_ =
+            CORBA_EnumDef::_narrow (prev_def.in ()
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -714,7 +714,7 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_operation (AST_Operation *node)
 {
   ifr_adding_visitor_operation visitor (node);
@@ -722,7 +722,7 @@ ifr_adding_visitor::visit_operation (AST_Operation *node)
   return visitor.visit_operation (node);
 }
 
-int 
+int
 ifr_adding_visitor::visit_field (AST_Field *node)
 {
   AST_Type *ft = AST_Type::narrow_from_decl (node->field_type ());
@@ -734,7 +734,7 @@ ifr_adding_visitor::visit_field (AST_Field *node)
           ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
           ACE_TEXT ("visit_field - ")
           ACE_TEXT ("Bad field type\n")
-        ), 
+        ),
         -1
       );
     }
@@ -746,7 +746,7 @@ ifr_adding_visitor::visit_field (AST_Field *node)
           ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
           ACE_TEXT ("visit_field - ")
           ACE_TEXT ("failed to accept visitor\n")
-        ), 
+        ),
         -1
       );
     }
@@ -754,29 +754,29 @@ ifr_adding_visitor::visit_field (AST_Field *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_attribute (AST_Attribute *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       AST_Type *type = node->field_type ();
 
       // Updates ir_current_.
-      this->get_referenced_type (type,
-                                 ACE_TRY_ENV);
+      this->get_referenced_type (type
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::AttributeMode mode = 
+      CORBA::AttributeMode mode =
         node->readonly () ? CORBA::ATTR_READONLY : CORBA::ATTR_NORMAL;
 
       CORBA_Container_ptr current_scope = CORBA_Container::_nil ();
 
       if (be_global->ifr_scopes ().top (current_scope) == 0)
         {
-          CORBA_InterfaceDef_var iface = 
-            CORBA_InterfaceDef::_narrow (current_scope,
-                                         ACE_TRY_ENV);
+          CORBA_InterfaceDef_var iface =
+            CORBA_InterfaceDef::_narrow (current_scope
+                                         TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA_AttributeDef_var new_def =
@@ -784,8 +784,8 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node)
                                      node->local_name ()->get_string (),
                                      this->gen_version (node),
                                      this->ir_current_.in (),
-                                     mode,
-                                     ACE_TRY_ENV);
+                                     mode
+                                     TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
@@ -794,7 +794,7 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node)
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_attribute -")
               ACE_TEXT (" scope stack is empty\n")
-            ),  
+            ),
             -1
           );
         }
@@ -811,7 +811,7 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_union (AST_Union *node)
 {
   if (node->imported () && !be_global->do_included_files ())
@@ -819,12 +819,12 @@ ifr_adding_visitor::visit_union (AST_Union *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      CORBA_Contained_var prev_def = 
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+      CORBA_Contained_var prev_def =
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (prev_def.in ()))
@@ -850,15 +850,15 @@ ifr_adding_visitor::visit_union (AST_Union *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               return this->visit_union (node);
             }
 
           this->ir_current_ =
-            CORBA_UnionDef::_narrow (prev_def.in (),
-                                     ACE_TRY_ENV);
+            CORBA_UnionDef::_narrow (prev_def.in ()
+                                     TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -874,7 +874,7 @@ ifr_adding_visitor::visit_union (AST_Union *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_constant (AST_Constant *node)
 {
   if (node->imported () && !be_global->do_included_files ())
@@ -884,12 +884,12 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
 
   const char *id = node->repoID ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA_Contained_var prev_def =
-        be_global->repository ()->lookup_id (id,
-                                             ACE_TRY_ENV);
+        be_global->repository ()->lookup_id (id
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Nothing prevents this constant's repo id from already being
@@ -905,7 +905,7 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else
@@ -920,9 +920,9 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
 
       CORBA::PrimitiveKind pkind = this->expr_type_to_pkind (ev->et);
 
-      CORBA_IDLType_var idl_type = 
-        be_global->repository ()->get_primitive (pkind,
-                                                 ACE_TRY_ENV);
+      CORBA_IDLType_var idl_type =
+        be_global->repository ()->get_primitive (pkind
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any any;
@@ -940,8 +940,8 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
                 node->local_name ()->get_string (),
                 this->gen_version (node),
                 idl_type.in (),
-                any,
-                ACE_TRY_ENV
+                any
+                TAO_ENV_ARG_PARAMETER
               );
           ACE_TRY_CHECK;
         }
@@ -951,7 +951,7 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_constant -")
               ACE_TEXT (" scope stack is empty\n")
-            ),  
+            ),
             -1
           );
         }
@@ -968,25 +968,25 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_array (AST_Array *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->element_type (node->base_type (),
-                          ACE_TRY_ENV);
+      this->element_type (node->base_type ()
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       AST_Expression **dims = node->dims ();
 
       for (unsigned long i = node->n_dims (); i > 0; --i)
         {
-          this->ir_current_ = 
+          this->ir_current_ =
             be_global->repository ()->create_array (
                 dims[i - 1]->ev ()->u.ulval,
-                this->ir_current_.in (),
-                ACE_TRY_ENV
+                this->ir_current_.in ()
+                TAO_ENV_ARG_PARAMETER
               );
           ACE_TRY_CHECK;
         }
@@ -1003,21 +1003,21 @@ ifr_adding_visitor::visit_array (AST_Array *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_sequence (AST_Sequence *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->element_type (node->base_type (),
-                          ACE_TRY_ENV);
+      this->element_type (node->base_type ()
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->ir_current_ =
         be_global->repository ()->create_sequence (
                                       node->max_size ()->ev ()->u.ulval,
-                                      this->ir_current_.in (),
-                                      ACE_TRY_ENV
+                                      this->ir_current_.in ()
+                                      TAO_ENV_ARG_PARAMETER
                                     );
       ACE_TRY_CHECK;
     }
@@ -1033,7 +1033,7 @@ ifr_adding_visitor::visit_sequence (AST_Sequence *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_string (AST_String *node)
 {
   AST_Expression *ex = node->max_size ();
@@ -1042,20 +1042,20 @@ ifr_adding_visitor::visit_string (AST_String *node)
 
   CORBA::ULong bound = ACE_static_cast (CORBA::ULong, ev->u.ulval);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       if (node->node_type () == AST_Decl::NT_string)
         {
           this->ir_current_ =
-            be_global->repository ()->create_string (bound,
-                                                     ACE_TRY_ENV);
+            be_global->repository ()->create_string (bound
+                                                     TAO_ENV_ARG_PARAMETER);
         }
       else
         {
           this->ir_current_ =
-            be_global->repository ()->create_wstring (bound,
-                                                      ACE_TRY_ENV);
+            be_global->repository ()->create_wstring (bound
+                                                      TAO_ENV_ARG_PARAMETER);
         }
 
       ACE_TRY_CHECK;
@@ -1072,7 +1072,7 @@ ifr_adding_visitor::visit_string (AST_String *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_typedef (AST_Typedef *node)
 {
   if (node->imported () && !be_global->do_included_files ())
@@ -1080,33 +1080,33 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Is this typedef already in the respository?
       CORBA_Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
         {
-          this->element_type (node->base_type (),
-                              ACE_TRY_ENV);
+          this->element_type (node->base_type ()
+                              TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA_Container_ptr current_scope = CORBA_Container::_nil ();
 
           if (be_global->ifr_scopes ().top (current_scope) == 0)
             {
-              this->ir_current_ = 
+              this->ir_current_ =
                 current_scope->create_alias (
                    node->repoID (),
                    node->local_name ()->get_string (),
                    this->gen_version (node),
-                   this->ir_current_.in (),
-                   ACE_TRY_ENV
+                   this->ir_current_.in ()
+                   TAO_ENV_ARG_PARAMETER
                  );
               ACE_TRY_CHECK;
             }
@@ -1116,7 +1116,7 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node)
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_typedef -")
                   ACE_TEXT (" scope stack is empty\n")
-                ),  
+                ),
                 -1
               );
             }
@@ -1131,16 +1131,16 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
               return this->visit_typedef (node);
             }
 
-          this->ir_current_ = 
-            CORBA_TypedefDef::_narrow (prev_def.in (),
-                                       ACE_TRY_ENV);
+          this->ir_current_ =
+            CORBA_TypedefDef::_narrow (prev_def.in ()
+                                       TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -1156,15 +1156,15 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_root (AST_Root *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      CORBA_Container_var new_scope = 
-        CORBA_Container::_narrow (be_global->repository (),
-                                  ACE_TRY_ENV);
+      CORBA_Container_var new_scope =
+        CORBA_Container::_narrow (be_global->repository ()
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (be_global->ifr_scopes ().push (new_scope.in ()) != 0)
@@ -1173,7 +1173,7 @@ ifr_adding_visitor::visit_root (AST_Root *node)
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_root -")
               ACE_TEXT (" scope push failed\n")
-            ),  
+            ),
             -1
           );
         }
@@ -1184,7 +1184,7 @@ ifr_adding_visitor::visit_root (AST_Root *node)
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_root -")
               ACE_TEXT (" visit_scope failed\n")
-            ),  
+            ),
             -1
           );
         }
@@ -1197,7 +1197,7 @@ ifr_adding_visitor::visit_root (AST_Root *node)
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_root -")
               ACE_TEXT (" scope pop failed\n")
-            ),  
+            ),
             -1
           );
         }
@@ -1214,7 +1214,7 @@ ifr_adding_visitor::visit_root (AST_Root *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_native (AST_Native *node)
 {
   if (node->imported () && !be_global->do_included_files ())
@@ -1222,12 +1222,12 @@ ifr_adding_visitor::visit_native (AST_Native *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA_Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (prev_def.in ()))
@@ -1240,8 +1240,8 @@ ifr_adding_visitor::visit_native (AST_Native *node)
                 current_scope->create_native (
                     node->repoID (),
                     node->local_name ()->get_string (),
-                    this->gen_version (node),
-                    ACE_TRY_ENV
+                    this->gen_version (node)
+                    TAO_ENV_ARG_PARAMETER
                   );
               ACE_TRY_CHECK;
             }
@@ -1251,7 +1251,7 @@ ifr_adding_visitor::visit_native (AST_Native *node)
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_native -")
                   ACE_TEXT (" scope stack is empty\n")
-                ),  
+                ),
                 -1
               );
             }
@@ -1266,7 +1266,7 @@ ifr_adding_visitor::visit_native (AST_Native *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
@@ -1274,8 +1274,8 @@ ifr_adding_visitor::visit_native (AST_Native *node)
             }
 
           this->ir_current_ =
-            CORBA_NativeDef::_narrow (prev_def.in (),
-                                      ACE_TRY_ENV);
+            CORBA_NativeDef::_narrow (prev_def.in ()
+                                      TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -1291,7 +1291,7 @@ ifr_adding_visitor::visit_native (AST_Native *node)
   return 0;
 }
 
-CORBA::PrimitiveKind 
+CORBA::PrimitiveKind
 ifr_adding_visitor::expr_type_to_pkind (AST_Expression::ExprType et)
 {
   switch (et)
@@ -1337,7 +1337,7 @@ ifr_adding_visitor::expr_type_to_pkind (AST_Expression::ExprType et)
     }
 }
 
-CORBA::PrimitiveKind 
+CORBA::PrimitiveKind
 ifr_adding_visitor::predefined_type_to_pkind (AST_PredefinedType *node)
 {
   switch (node->pt ())
@@ -1394,7 +1394,7 @@ ifr_adding_visitor::predefined_type_to_pkind (AST_PredefinedType *node)
     }
 }
 
-void 
+void
 ifr_adding_visitor::load_any (AST_Expression::AST_ExprValue *ev,
                               CORBA::Any &any)
 {
@@ -1429,7 +1429,7 @@ ifr_adding_visitor::load_any (AST_Expression::AST_ExprValue *ev,
 #if 0
     case AST_Expression::EV_longdouble:
     // Not implemented in IDL compiler.
-#endif      
+#endif
     case AST_Expression::EV_char:
       any <<= CORBA::Any::from_char (ev->u.cval);
       break;
@@ -1475,9 +1475,9 @@ ifr_adding_visitor::gen_version (AST_Decl *)
   return "1.0";
 }
 
-void 
-ifr_adding_visitor::element_type (AST_Type *base_type,
-                                  CORBA::Environment &ACE_TRY_ENV)
+void
+ifr_adding_visitor::element_type (AST_Type *base_type
+                                  TAO_ENV_ARG_DECL)
 {
   if (base_type->anonymous ())
     {
@@ -1492,9 +1492,9 @@ ifr_adding_visitor::element_type (AST_Type *base_type,
     }
   else
     {
-      CORBA_Contained_var contained = 
-        be_global->repository ()->lookup_id (base_type->repoID (),
-                                             ACE_TRY_ENV);
+      CORBA_Contained_var contained =
+        be_global->repository ()->lookup_id (base_type->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (CORBA::is_nil (contained.in ()))
@@ -1506,17 +1506,17 @@ ifr_adding_visitor::element_type (AST_Type *base_type,
             ));
         }
 
-      this->ir_current_ = CORBA_IDLType::_narrow (contained.in (),
-                                                  ACE_TRY_ENV);
+      this->ir_current_ = CORBA_IDLType::_narrow (contained.in ()
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 int
-ifr_adding_visitor::create_interface_def (AST_Interface *node,
-                                          CORBA::Environment &ACE_TRY_ENV)
+ifr_adding_visitor::create_interface_def (AST_Interface *node
+                                          TAO_ENV_ARG_DECL)
 {
-  CORBA::ULong n_parents = ACE_static_cast (CORBA::ULong, 
+  CORBA::ULong n_parents = ACE_static_cast (CORBA::ULong,
                                             node->n_inherits ());
 
   CORBA_InterfaceDefSeq bases (n_parents);
@@ -1537,18 +1537,18 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node,
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
               ACE_TEXT ("visit_interface - call for parent node failed\n")
-            ),  
+            ),
             -1
           );
         }
 
-      result = 
-        be_global->repository ()->lookup_id (parents[i]->repoID (),
-                                             ACE_TRY_ENV);
+      result =
+        be_global->repository ()->lookup_id (parents[i]->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
-      bases[i] = CORBA_InterfaceDef::_narrow (result.in (),
-                                              ACE_TRY_ENV);
+      bases[i] = CORBA_InterfaceDef::_narrow (result.in ()
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (CORBA::is_nil (bases[i].in ()))
@@ -1558,14 +1558,14 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
               ACE_TEXT ("visit_interface -")
               ACE_TEXT (" CORBA_InterfaceDef::_narrow failed\n")
-            ),  
+            ),
             -1
           );
         }
     }
 
   CORBA_Container_ptr current_scope = CORBA_Container::_nil ();
-  
+
   if (be_global->ifr_scopes ().top (current_scope) == 0)
     {
       CORBA_InterfaceDef_var new_def;
@@ -1577,8 +1577,8 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node,
                                node->repoID (),
                                node->local_name ()->get_string (),
                                this->gen_version (node),
-                               bases,
-                               ACE_TRY_ENV
+                               bases
+                               TAO_ENV_ARG_PARAMETER
                              );
         }
       else
@@ -1588,8 +1588,8 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node,
                                node->repoID (),
                                node->local_name ()->get_string (),
                                this->gen_version (node),
-                               bases,
-                               ACE_TRY_ENV
+                               bases
+                               TAO_ENV_ARG_PARAMETER
                              );
         }
 
@@ -1599,8 +1599,8 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node,
 
       // Push the new IR object onto the scope stack.
       CORBA_Container_var new_scope =
-        CORBA_Container::_narrow (new_def.in (),
-                                  ACE_TRY_ENV);
+        CORBA_Container::_narrow (new_def.in ()
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (be_global->ifr_scopes ().push (new_scope.in ()) != 0)
@@ -1610,7 +1610,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
               ACE_TEXT ("visit_interface -")
               ACE_TEXT (" scope push failed\n")
-            ),  
+            ),
             -1
           );
         }
@@ -1623,7 +1623,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
               ACE_TEXT ("visit_interface -")
               ACE_TEXT (" visit_scope failed\n")
-            ),  
+            ),
             -1
           );
         }
@@ -1634,7 +1634,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node,
       // the info in available anywhere. So it's a good idea to
       // update the current IR object holder now. This will
       // consume the objref pointer.
-      this->ir_current_ = 
+      this->ir_current_ =
         CORBA_IDLType::_duplicate (new_def.in ());
 
       CORBA_Container_ptr used_scope = CORBA_Container::_nil ();
@@ -1647,7 +1647,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
               ACE_TEXT ("visit_interface -")
               ACE_TEXT (" scope pop failed\n")
-            ),  
+            ),
             -1
           );
         }
@@ -1658,7 +1658,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node,
           LM_ERROR,
           ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_interface -")
           ACE_TEXT (" scope stack is empty\n")
-        ),  
+        ),
         -1
       );
     }
@@ -1667,8 +1667,8 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node,
 }
 
 void
-ifr_adding_visitor::get_referenced_type (AST_Type *node,
-                                         CORBA::Environment &ACE_TRY_ENV)
+ifr_adding_visitor::get_referenced_type (AST_Type *node
+                                         TAO_ENV_ARG_DECL)
 {
   switch (node->node_type ())
   {
@@ -1690,20 +1690,19 @@ ifr_adding_visitor::get_referenced_type (AST_Type *node,
             ));
         }
 
-      ACE_UNUSED_ARG (ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check
       break;
     // For names types, we can just look up the entry and update
     // ir_current_.
     default:
       {
         CORBA_Contained_var prev_def =
-          be_global->repository ()->lookup_id (node->repoID (),
-                                               ACE_TRY_ENV);
+          be_global->repository ()->lookup_id (node->repoID ()
+                                               TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         this->ir_current_ =
-          CORBA_IDLType::_narrow (prev_def.in (),
-                                  ACE_TRY_ENV);
+          CORBA_IDLType::_narrow (prev_def.in ()
+                                  TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
         break;
       }
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h
index 6fdc248558b..b93ecc2f061 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h
@@ -119,17 +119,17 @@ protected:
   const char *gen_version (AST_Decl *node);
   // Defaults to "1.0" for now.
 
-  void element_type (AST_Type *base_type,
-                     CORBA::Environment &ACE_TRY_ENV);
+  void element_type (AST_Type *base_type
+                     TAO_ENV_ARG_DECL);
   // Creates or looks up the element type of an array or sequence,
   // and stores the result in ir_current_.
 
-  int create_interface_def (AST_Interface *node,
-                            CORBA::Environment &ACE_TRY_ENV);
+  int create_interface_def (AST_Interface *node
+                            TAO_ENV_ARG_DECL);
   // Common code factored out of visit_interface().
 
-  void get_referenced_type (AST_Type *node,
-                            CORBA::Environment &ACE_TRY_ENV);
+  void get_referenced_type (AST_Type *node
+                            TAO_ENV_ARG_DECL);
   // Utility method to update ir_current_ for struct members, union
   // members, operation parameters and operation return types.
 
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
index 8ae7be9837e..29fac8c4193 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
@@ -36,7 +36,7 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
 
   AST_Field **f = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Visit each field.
@@ -49,7 +49,7 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor_exception::")
                   ACE_TEXT ("visit_scope -")
                   ACE_TEXT (" field node access failed\n")
-                ), 
+                ),
                 -1
               );
             }
@@ -69,7 +69,7 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
                       ACE_TEXT ("(%N:%l) ifr_adding_visitor_exception::")
                       ACE_TEXT ("visit_scope -")
                       ACE_TEXT (" failed to accept visitor\n")
-                    ),  
+                    ),
                     -1
                   );
                 }
@@ -77,20 +77,19 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
           else
             {
               // Updates ir_current_.
-              this->get_referenced_type (ft,
-                                         ACE_TRY_ENV);
+              this->get_referenced_type (ft TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
-          this->members_[i].name = 
+          this->members_[i].name =
             CORBA::string_dup ((*f)->local_name ()->get_string ());
 
           // IfR method create_exception does not use this - it just needs
           // to be non-zero for marshaling.
-          this->members_[i].type = 
+          this->members_[i].type =
             CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
-          this->members_[i].type_def = 
+          this->members_[i].type_def =
             CORBA_IDLType::_duplicate (this->ir_current_.in ());
         }
     }
@@ -111,13 +110,13 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
 int
 ifr_adding_visitor_exception::visit_structure (AST_Structure *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Is this union already in the respository?
-      CORBA_Contained_var prev_def = 
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+      CORBA_Contained_var prev_def =
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
@@ -134,9 +133,9 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node)
               this->ir_current_ =
                 CORBA_IDLType::_duplicate (visitor.ir_current ());
 
-              CORBA_Contained_ptr tmp = 
-                CORBA_Contained::_narrow (visitor.ir_current (),
-                                          ACE_TRY_ENV);
+              CORBA_Contained_ptr tmp =
+                CORBA_Contained::_narrow (visitor.ir_current ()
+                                          TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Since the enclosing ExceptionDef hasn't been created
@@ -156,7 +155,7 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
@@ -164,8 +163,8 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node)
             }
 
           this->ir_current_ =
-            CORBA_IDLType::_narrow (prev_def.in (),
-                                    ACE_TRY_ENV);
+            CORBA_IDLType::_narrow (prev_def.in ()
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -186,12 +185,12 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node)
 int
 ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA_Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!CORBA::is_nil (prev_def.in ()))
@@ -202,7 +201,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will create a new EnumDef entry.
@@ -222,7 +221,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
               ACE_TEXT ("(%N:%l) ifr_adding_visitor_exception::")
               ACE_TEXT ("visit_exception -")
               ACE_TEXT (" visit_scope failed\n")
-            ),  
+            ),
             -1
           );
         }
@@ -236,17 +235,17 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
               ACE_TEXT ("(%N:%l) ifr_adding_visitor_exception::")
               ACE_TEXT ("visit_exception -")
               ACE_TEXT (" scope stack is empty\n")
-            ),  
+            ),
             -1
           );
         }
 
-      CORBA_ExceptionDef_var new_def = 
+      CORBA_ExceptionDef_var new_def =
         current_scope->create_exception (node->repoID (),
                                          node->local_name ()->get_string (),
                                          this->gen_version (node),
-                                         this->members_,
-                                         ACE_TRY_ENV);
+                                         this->members_
+                                         TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -257,24 +256,24 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
           CORBA_Contained_var traveller;
 
           CORBA_Container_var new_container =
-            CORBA_Container::_narrow (new_def.in (),
-                                      ACE_TRY_ENV);
+            CORBA_Container::_narrow (new_def.in ()
+                                      TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           for (size_t i = 0; i < size; ++i)
             {
               this->move_queue_.dequeue_head (traveller);
 
-              CORBA::String_var name = traveller->name (ACE_TRY_ENV);
+              CORBA::String_var name = traveller->name (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
-              CORBA::String_var version = traveller->version (ACE_TRY_ENV);
+              CORBA::String_var version = traveller->version (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               traveller->move (new_container.in (),
                                name.in (),
-                               version.in (),
-                               ACE_TRY_ENV);
+                               version.in ()
+                               TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -298,19 +297,19 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
 int
 ifr_adding_visitor_exception::visit_enum (AST_Enum *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Is this enum already in the respository?
       CORBA_Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
         {
-          CORBA::ULong member_count = ACE_static_cast (CORBA::ULong, 
+          CORBA::ULong member_count = ACE_static_cast (CORBA::ULong,
                                                        node->member_count ());
 
           CORBA_EnumMemberSeq members (member_count);
@@ -323,7 +322,7 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node)
             {
               member_name = node->value_to_name (i);
 
-              members[i] = 
+              members[i] =
                 CORBA::string_dup (
                     member_name->last_component ()->get_string ()
                   );
@@ -334,14 +333,14 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node)
                                           node->repoID (),
                                           node->local_name ()->get_string (),
                                           this->gen_version (node),
-                                          members,
-                                          ACE_TRY_ENV
+                                          members
+                                          TAO_ENV_ARG_PARAMETER
                                         );
           ACE_TRY_CHECK;
 
-          CORBA_Contained_ptr tmp = 
-            CORBA_Contained::_narrow (this->ir_current_.in (),
-                                      ACE_TRY_ENV);
+          CORBA_Contained_ptr tmp =
+            CORBA_Contained::_narrow (this->ir_current_.in ()
+                                      TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           this->move_queue_.enqueue_tail (tmp);
@@ -356,16 +355,16 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
               return this->visit_enum (node);
             }
 
-          this->ir_current_ = 
-            CORBA_IDLType::_narrow (prev_def.in (),
-                                    ACE_TRY_ENV);
+          this->ir_current_ =
+            CORBA_IDLType::_narrow (prev_def.in ()
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -386,13 +385,13 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node)
 int
 ifr_adding_visitor_exception::visit_union (AST_Union *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Is this union already in the respository?
-      CORBA_Contained_var prev_def = 
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+      CORBA_Contained_var prev_def =
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
@@ -409,9 +408,9 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node)
               this->ir_current_ =
                 CORBA_IDLType::_duplicate (visitor.ir_current ());
 
-              CORBA_Contained_ptr tmp = 
-                CORBA_Contained::_narrow (visitor.ir_current (),
-                                          ACE_TRY_ENV);
+              CORBA_Contained_ptr tmp =
+                CORBA_Contained::_narrow (visitor.ir_current ()
+                                          TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Since the enclosing ExceptionDef hasn't been created
@@ -431,7 +430,7 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
@@ -439,8 +438,8 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node)
             }
 
           this->ir_current_ =
-            CORBA_IDLType::_narrow (prev_def.in (),
-                                    ACE_TRY_ENV);
+            CORBA_IDLType::_narrow (prev_def.in ()
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -458,7 +457,7 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node)
   return 0;
 }
 
-CORBA_IDLType_ptr 
+CORBA_IDLType_ptr
 ifr_adding_visitor_exception::ir_current (void) const
 {
   return this->ir_current_.in ();
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
index c22bf56b2b2..b714b59a91b 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
@@ -17,10 +17,10 @@ ifr_adding_visitor_operation::~ifr_adding_visitor_operation (void)
 {
 }
 
-int 
+int
 ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // If this operation is already in the repository (for example, if
@@ -29,8 +29,8 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
       // compiler front end would have told us.
 
       CORBA_Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!CORBA::is_nil (prev_def.in ()))
@@ -42,7 +42,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
       // will look up each parameter and add its repository entry to
       // our params_ member.
 
-      CORBA::ULong length = ACE_static_cast (CORBA::ULong, 
+      CORBA::ULong length = ACE_static_cast (CORBA::ULong,
                                              node->argument_count ());
 
       this->params_.length (length);
@@ -54,7 +54,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
               ACE_TEXT ("(%N:%l) ifr_adding_visitor_operation::")
               ACE_TEXT ("visit_operation -")
               ACE_TEXT (" visit_scope failed\n")
-            ),  
+            ),
             -1
           );
         }
@@ -87,12 +87,12 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
           ex = ex_iter.item ();
 
           prev_def =
-            be_global->repository ()->lookup_id (ex->repoID (),
-                                                 ACE_TRY_ENV);
+            be_global->repository ()->lookup_id (ex->repoID ()
+                                                 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          exceptions[i++] = CORBA_ExceptionDef::_narrow (prev_def.in (),
-                                                         ACE_TRY_ENV);
+          exceptions[i++] = CORBA_ExceptionDef::_narrow (prev_def.in ()
+                                                         TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ex_iter.next ();
@@ -133,13 +133,13 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
       AST_Type *return_type = node->return_type ();
 
       // Updates ir_current_.
-      this->get_referenced_type (return_type,
-                                 ACE_TRY_ENV);
+      this->get_referenced_type (return_type
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Is the operation oneway?
-      CORBA::OperationMode mode = node->flags () == AST_Operation::OP_oneway 
-                                 ? CORBA::OP_ONEWAY 
+      CORBA::OperationMode mode = node->flags () == AST_Operation::OP_oneway
+                                 ? CORBA::OP_ONEWAY
                                  : CORBA::OP_NORMAL;
 
       // Create the repository entry.
@@ -148,9 +148,9 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
 
       if (be_global->ifr_scopes ().top (current_scope) == 0)
         {
-          CORBA_InterfaceDef_var iface = 
-            CORBA_InterfaceDef::_narrow (current_scope,
-                                         ACE_TRY_ENV);
+          CORBA_InterfaceDef_var iface =
+            CORBA_InterfaceDef::_narrow (current_scope
+                                         TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA_OperationDef_var new_def =
@@ -161,8 +161,8 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
                                      mode,
                                      this->params_,
                                      exceptions,
-                                     contexts,
-                                     ACE_TRY_ENV);
+                                     contexts
+                                     TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
@@ -172,7 +172,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
               ACE_TEXT ("(%N:%l) ifr_adding_visitor_operation::")
               ACE_TEXT ("visit_operation -")
               ACE_TEXT (" scope stack is empty\n")
-            ),  
+            ),
             -1
           );
         }
@@ -191,7 +191,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor_operation::visit_argument (AST_Argument *node)
 {
   // Get the parameter's name.
@@ -199,21 +199,21 @@ ifr_adding_visitor_operation::visit_argument (AST_Argument *node)
 
   AST_Type *arg_type = node->field_type ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Updates ir_current_.
-      this->get_referenced_type (arg_type,
-                                 ACE_TRY_ENV);
+      this->get_referenced_type (arg_type
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->params_[this->index_].type_def = 
+      this->params_[this->index_].type_def =
         CORBA_IDLType::_duplicate (this->ir_current_.in ());
 
 
-      // Fortunately, AST_Field::Direction and CORBA_ParameterMode 
+      // Fortunately, AST_Field::Direction and CORBA_ParameterMode
       // are ordered identically.
-      this->params_[this->index_].mode = 
+      this->params_[this->index_].mode =
         (CORBA::ParameterMode) node->direction ();
 
       // IfR method create_operation does not use this - it just needs
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
index d8eb9bacc49..5a68cd87383 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
@@ -39,7 +39,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
 
   AST_Field **f = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Visit each field.
@@ -52,7 +52,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::")
                   ACE_TEXT ("visit_scope -")
                   ACE_TEXT (" field node access failed\n")
-                ), 
+                ),
                 -1
               );
             }
@@ -80,7 +80,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
                           ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::")
                           ACE_TEXT ("visit_scope -")
                           ACE_TEXT (" failed to accept visitor\n")
-                        ),  
+                        ),
                         -1
                       );
                     }
@@ -88,9 +88,9 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
                   this->ir_current_ =
                     CORBA_IDLType::_duplicate (visitor.ir_current ());
 
-                  CORBA_Contained_ptr tmp = 
-                    CORBA_Contained::_narrow (visitor.ir_current (),
-                                              ACE_TRY_ENV);
+                  CORBA_Contained_ptr tmp =
+                    CORBA_Contained::_narrow (visitor.ir_current ()
+                                              TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   this->move_queue_.enqueue_tail (tmp);
@@ -104,7 +104,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
                           ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::")
                           ACE_TEXT ("visit_scope -")
                           ACE_TEXT (" failed to accept visitor\n")
-                        ),  
+                        ),
                         -1
                       );
                     }
@@ -113,12 +113,12 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
           else
             {
               // Updates ir_current_.
-              this->get_referenced_type (ft,
-                                         ACE_TRY_ENV);
+              this->get_referenced_type (ft
+                                         TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
-          this->members_[i].name = 
+          this->members_[i].name =
             CORBA::string_dup ((*f)->local_name ()->get_string ());
 
           // IfR method create_struct does not use this - it just needs
@@ -126,7 +126,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
           this->members_[i].type =
             CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
-          this->members_[i].type_def = 
+          this->members_[i].type_def =
             CORBA_IDLType::_duplicate (this->ir_current_.in ());
         }
     }
@@ -147,12 +147,12 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
 int
 ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA_Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (prev_def.in ()))
@@ -164,20 +164,20 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::")
                   ACE_TEXT ("visit_structure -")
                   ACE_TEXT (" visit_scope failed\n")
-                ),  
+                ),
                 -1
               );
             }
 
           if (this->is_nested_)
             {
-              this->ir_current_ = 
+              this->ir_current_ =
                 be_global->holding_scope ()->create_struct (
                     node->repoID (),
                     node->local_name ()->get_string (),
                     this->gen_version (node),
-                    this->members_,
-                    ACE_TRY_ENV
+                    this->members_
+                    TAO_ENV_ARG_PARAMETER
                   );
             }
           else
@@ -191,18 +191,18 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
                       ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::")
                       ACE_TEXT ("visit_structure -")
                       ACE_TEXT (" scope stack is empty\n")
-                    ),  
+                    ),
                     -1
                   );
                 }
 
-              this->ir_current_ = 
+              this->ir_current_ =
                 current_scope->create_struct (
                                    node->repoID (),
                                    node->local_name ()->get_string (),
                                    this->gen_version (node),
-                                   this->members_,
-                                   ACE_TRY_ENV
+                                   this->members_
+                                   TAO_ENV_ARG_PARAMETER
                                 );
             }
 
@@ -215,25 +215,25 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
               CORBA_Contained_var traveller;
 
               CORBA_Container_var new_container =
-                CORBA_Container::_narrow (this->ir_current_.in (),
-                                          ACE_TRY_ENV);
+                CORBA_Container::_narrow (this->ir_current_.in ()
+                                          TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               for (size_t i = 0; i < size; ++i)
                 {
                   this->move_queue_.dequeue_head (traveller);
 
-                  CORBA::String_var name = traveller->name (ACE_TRY_ENV);
+                  CORBA::String_var name = traveller->name (TAO_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
-                  CORBA::String_var version = 
-                    traveller->version (ACE_TRY_ENV);
+                  CORBA::String_var version =
+                    traveller->version (TAO_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   traveller->move (new_container.in (),
                                    name.in (),
-                                   version.in (),
-                                   ACE_TRY_ENV);
+                                   version.in ()
+                                   TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -248,7 +248,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
@@ -256,8 +256,8 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
             }
 
           this->ir_current_ =
-            CORBA_IDLType::_narrow (prev_def.in (),
-                                    ACE_TRY_ENV);
+            CORBA_IDLType::_narrow (prev_def.in ()
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -278,19 +278,19 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
 int
 ifr_adding_visitor_structure::visit_enum (AST_Enum *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Is this enum already in the respository?
       CORBA_Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
         {
-          CORBA::ULong member_count = ACE_static_cast (CORBA::ULong, 
+          CORBA::ULong member_count = ACE_static_cast (CORBA::ULong,
                                                        node->member_count ());
 
           CORBA_EnumMemberSeq members (member_count);
@@ -303,7 +303,7 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node)
             {
               member_name = node->value_to_name (i);
 
-              members[i] = 
+              members[i] =
                 CORBA::string_dup (
                     member_name->last_component ()->get_string ()
                   );
@@ -314,14 +314,14 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node)
                                           node->repoID (),
                                           node->local_name ()->get_string (),
                                           this->gen_version (node),
-                                          members,
-                                          ACE_TRY_ENV
+                                          members
+                                          TAO_ENV_ARG_PARAMETER
                                         );
           ACE_TRY_CHECK;
 
-          CORBA_Contained_ptr tmp = 
-            CORBA_Contained::_narrow (this->ir_current_.in (),
-                                      ACE_TRY_ENV);
+          CORBA_Contained_ptr tmp =
+            CORBA_Contained::_narrow (this->ir_current_.in ()
+                                      TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Since the enclosing StructDef hasn't been created
@@ -340,16 +340,16 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
               return this->visit_enum (node);
             }
 
-          this->ir_current_ = 
-            CORBA_IDLType::_narrow (prev_def.in (),
-                                    ACE_TRY_ENV);
+          this->ir_current_ =
+            CORBA_IDLType::_narrow (prev_def.in ()
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -370,13 +370,13 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node)
 int
 ifr_adding_visitor_structure::visit_union (AST_Union *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Is this union already in the respository?
-      CORBA_Contained_var prev_def = 
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+      CORBA_Contained_var prev_def =
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
@@ -393,9 +393,9 @@ ifr_adding_visitor_structure::visit_union (AST_Union *node)
               this->ir_current_ =
                 CORBA_IDLType::_duplicate (visitor.ir_current ());
 
-              CORBA_Contained_ptr tmp = 
-                CORBA_Contained::_narrow (visitor.ir_current (),
-                                          ACE_TRY_ENV);
+              CORBA_Contained_ptr tmp =
+                CORBA_Contained::_narrow (visitor.ir_current ()
+                                          TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Since the enclosing StructDef hasn't been created
@@ -415,7 +415,7 @@ ifr_adding_visitor_structure::visit_union (AST_Union *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
@@ -423,8 +423,8 @@ ifr_adding_visitor_structure::visit_union (AST_Union *node)
             }
 
           this->ir_current_ =
-            CORBA_IDLType::_narrow (prev_def.in (),
-                                    ACE_TRY_ENV);
+            CORBA_IDLType::_narrow (prev_def.in ()
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -442,7 +442,7 @@ ifr_adding_visitor_structure::visit_union (AST_Union *node)
   return 0;
 }
 
-CORBA_IDLType_ptr 
+CORBA_IDLType_ptr
 ifr_adding_visitor_structure::ir_current (void) const
 {
   return this->ir_current_.in ();
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
index 647e861c4fb..aea10197d74 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
@@ -42,7 +42,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
   // Index into members_.
   CORBA::ULong index = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Visit each field.
@@ -55,7 +55,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::")
                   ACE_TEXT ("visit_scope -")
                   ACE_TEXT (" field node access failed\n")
-                ), 
+                ),
                 -1
               );
             }
@@ -83,7 +83,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
                           ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::")
                           ACE_TEXT ("visit_scope -")
                           ACE_TEXT (" failed to accept visitor\n")
-                        ),  
+                        ),
                         -1
                       );
                     }
@@ -91,9 +91,9 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
                   this->ir_current_ =
                     CORBA_IDLType::_duplicate (visitor.ir_current ());
 
-                  CORBA_Contained_ptr tmp = 
-                    CORBA_Contained::_narrow (visitor.ir_current (),
-                                              ACE_TRY_ENV);
+                  CORBA_Contained_ptr tmp =
+                    CORBA_Contained::_narrow (visitor.ir_current ()
+                                              TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   this->move_queue_.enqueue_tail (tmp);
@@ -107,7 +107,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
                           ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::")
                           ACE_TEXT ("visit_scope -")
                           ACE_TEXT (" failed to accept visitor\n")
-                        ),  
+                        ),
                         -1
                       );
                     }
@@ -116,8 +116,8 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
           else
             {
               // Updates ir_current_.
-              this->get_referenced_type (ft,
-                                         ACE_TRY_ENV);
+              this->get_referenced_type (ft
+                                         TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -172,15 +172,15 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
                   this->members_[index].label <<= CORBA::Any::from_octet (0);
                 }
 
-              this->members_[index].name = 
+              this->members_[index].name =
                 CORBA::string_dup ((*f)->local_name ()->get_string ());
 
               // IfR method create_union does not use this - it just needs
               // to be non-zero for marshaling.
-              this->members_[index].type = 
+              this->members_[index].type =
                 CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
-              this->members_[index++].type_def = 
+              this->members_[index++].type_def =
                 CORBA_IDLType::_duplicate (this->ir_current_.in ());
             }
         }
@@ -202,13 +202,13 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
 int
 ifr_adding_visitor_union::visit_structure (AST_Structure *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Is this struct already in the respository?
-      CORBA_Contained_var prev_def = 
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+      CORBA_Contained_var prev_def =
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
@@ -225,9 +225,9 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node)
               this->ir_current_ =
                 CORBA_IDLType::_duplicate (visitor.ir_current ());
 
-              CORBA_Contained_ptr tmp = 
-                CORBA_Contained::_narrow (visitor.ir_current (),
-                                          ACE_TRY_ENV);
+              CORBA_Contained_ptr tmp =
+                CORBA_Contained::_narrow (visitor.ir_current ()
+                                          TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Since the enclosing UnionDef hasn't been created
@@ -247,7 +247,7 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
@@ -255,8 +255,8 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node)
             }
 
           this->ir_current_ =
-            CORBA_IDLType::_narrow (prev_def.in (),
-                                    ACE_TRY_ENV);
+            CORBA_IDLType::_narrow (prev_def.in ()
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -277,19 +277,19 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node)
 int
 ifr_adding_visitor_union::visit_enum (AST_Enum *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Is this enum already in the respository?
       CORBA_Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
         {
-          CORBA::ULong member_count = ACE_static_cast (CORBA::ULong, 
+          CORBA::ULong member_count = ACE_static_cast (CORBA::ULong,
                                                        node->member_count ());
 
           CORBA_EnumMemberSeq members (member_count);
@@ -302,7 +302,7 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node)
             {
               member_name = node->value_to_name (i);
 
-              members[i] = 
+              members[i] =
                 CORBA::string_dup (member_name->last_component ()->get_string ());
             }
 
@@ -311,14 +311,14 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node)
                                           node->repoID (),
                                           node->local_name ()->get_string (),
                                           this->gen_version (node),
-                                          members,
-                                          ACE_TRY_ENV
+                                          members
+                                          TAO_ENV_ARG_PARAMETER
                                         );
           ACE_TRY_CHECK;
 
-          CORBA_Contained_ptr tmp = 
-            CORBA_Contained::_narrow (this->ir_current_.in (),
-                                      ACE_TRY_ENV);
+          CORBA_Contained_ptr tmp =
+            CORBA_Contained::_narrow (this->ir_current_.in ()
+                                      TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Since the enclosing UnionDef hasn't been created
@@ -337,16 +337,16 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
               return this->visit_enum (node);
             }
 
-          this->ir_current_ = 
-            CORBA_IDLType::_narrow (prev_def.in (),
-                                    ACE_TRY_ENV);
+          this->ir_current_ =
+            CORBA_IDLType::_narrow (prev_def.in ()
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -367,12 +367,12 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node)
 int
 ifr_adding_visitor_union::visit_union (AST_Union *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA_Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (prev_def.in ()))
@@ -386,8 +386,8 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
           if (disc_type->node_type () == AST_Decl::NT_enum)
             {
               CORBA_Contained_var disc_def =
-                be_global->repository ()->lookup_id (disc_type->repoID (),
-                                                     ACE_TRY_ENV);
+                be_global->repository ()->lookup_id (disc_type->repoID ()
+                                                     TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               if (CORBA::is_nil (disc_def.in ()))
@@ -397,17 +397,17 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
                       ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::")
                       ACE_TEXT ("visit_union -")
                       ACE_TEXT (" discriminator not found in repository\n")
-                    ),  
+                    ),
                     -1
                   );
                 }
 
               CORBA_IDLType_var idl_def =
-                CORBA_IDLType::_narrow (disc_def.in (),
-                                        ACE_TRY_ENV);
+                CORBA_IDLType::_narrow (disc_def.in ()
+                                        TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
-              this->disc_tc_ = idl_def->type (ACE_TRY_ENV);
+              this->disc_tc_ = idl_def->type (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -417,7 +417,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::visit_union -")
                   ACE_TEXT (" visit_scope failed\n")
-                ),  
+                ),
                 -1
               );
             }
@@ -429,21 +429,21 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::visit_union -")
                   ACE_TEXT (" failed to accept visitor\n")
-                ),  
+                ),
                 -1
               );
             }
 
           if (this->is_nested_)
             {
-              this->ir_current_ = 
+              this->ir_current_ =
                 be_global->holding_scope ()->create_union (
                     node->repoID (),
                     node->local_name ()->get_string (),
                     this->gen_version (node),
                     this->ir_current_.in (),
-                    this->members_,
-                    ACE_TRY_ENV
+                    this->members_
+                    TAO_ENV_ARG_PARAMETER
                   );
             }
           else
@@ -457,19 +457,19 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
                       ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::")
                       ACE_TEXT ("visit_union -")
                       ACE_TEXT (" scope stack is empty\n")
-                    ),  
+                    ),
                     -1
                   );
                 }
 
-              this->ir_current_ = 
+              this->ir_current_ =
                 current_scope->create_union (
                                    node->repoID (),
                                    node->local_name ()->get_string (),
                                    this->gen_version (node),
                                    this->ir_current_.in (),
-                                   this->members_,
-                                   ACE_TRY_ENV
+                                   this->members_
+                                   TAO_ENV_ARG_PARAMETER
                                 );
             }
 
@@ -482,25 +482,25 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
               CORBA_Contained_var traveller;
 
               CORBA_Container_var new_container =
-                CORBA_Container::_narrow (this->ir_current_.in (),
-                                          ACE_TRY_ENV);
+                CORBA_Container::_narrow (this->ir_current_.in ()
+                                          TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               for (size_t i = 0; i < size; ++i)
                 {
                   this->move_queue_.dequeue_head (traveller);
 
-                  CORBA::String_var name = traveller->name (ACE_TRY_ENV);
+                  CORBA::String_var name = traveller->name (TAO_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
-                  CORBA::String_var version = 
-                    traveller->version (ACE_TRY_ENV);
+                  CORBA::String_var version =
+                    traveller->version (TAO_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   traveller->move (new_container.in (),
                                    name.in (),
-                                   version.in (),
-                                   ACE_TRY_ENV);
+                                   version.in ()
+                                   TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -515,7 +515,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
@@ -523,8 +523,8 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
             }
 
           this->ir_current_ =
-            CORBA_IDLType::_narrow (prev_def.in (),
-                                    ACE_TRY_ENV);
+            CORBA_IDLType::_narrow (prev_def.in ()
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -542,7 +542,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
   return 0;
 }
 
-CORBA_IDLType_ptr 
+CORBA_IDLType_ptr
 ifr_adding_visitor_union::ir_current (void) const
 {
   return this->ir_current_.in ();
diff --git a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
index 2a3baece26a..8baa46d085f 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
@@ -14,7 +14,7 @@ ifr_removing_visitor::~ifr_removing_visitor (void)
 {
 }
 
-int 
+int
 ifr_removing_visitor::visit_scope (UTL_Scope *node)
 {
   // Proceed if the number of members in our scope is greater than 0.
@@ -26,7 +26,7 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node)
 
       AST_Decl *d = 0;
 
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
       ACE_TRY
         {
           // Continue until each element is visited.
@@ -40,7 +40,7 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node)
                       LM_ERROR,
                       ACE_TEXT ("(%N:%l) ifr_removing_visitor::visit_scope -")
                       ACE_TEXT (" bad node in this scope\n")
-                    ), 
+                    ),
                     -1
                   );
                 }
@@ -52,9 +52,9 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node)
                   continue;
                 }
 
-              CORBA_Contained_var top_level = 
-                be_global->repository ()->lookup_id (d->repoID (),
-                                                     ACE_TRY_ENV);
+              CORBA_Contained_var top_level =
+                be_global->repository ()->lookup_id (d->repoID ()
+                                                     TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               if (!CORBA::is_nil (top_level.in ()))
@@ -62,7 +62,7 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node)
                   // All we have to do is call destroy() on each IR object
                   // in the global scope, because destroy() works on all
                   // the contents recursively.
-                  top_level->destroy (ACE_TRY_ENV);
+                  top_level->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }